From 399d1eb0696da98829d109f865771854c79f6124 Mon Sep 17 00:00:00 2001
From: Liam Beckett <lsb35@uclive.ac.nz>
Date: Wed, 14 Sep 2016 11:45:04 +1200
Subject: [PATCH] Changed the raw data GUI for flights and testing new branch

---
 .../group9/GUI/FlightRawDataController.java   |  12 ++
 src/main/resources/flight_raw_data.fxml       | 122 +++++++++++-------
 2 files changed, 88 insertions(+), 46 deletions(-)

diff --git a/src/main/java/seng202/group9/GUI/FlightRawDataController.java b/src/main/java/seng202/group9/GUI/FlightRawDataController.java
index 4eb91e3..a3beee4 100644
--- a/src/main/java/seng202/group9/GUI/FlightRawDataController.java
+++ b/src/main/java/seng202/group9/GUI/FlightRawDataController.java
@@ -1,7 +1,9 @@
 package seng202.group9.GUI;
 
 import javafx.fxml.Initializable;
+import javafx.scene.control.TableColumn;
 import seng202.group9.Controller.App;
+import seng202.group9.Controller.Dataset;
 
 import java.net.URL;
 import java.util.ResourceBundle;
@@ -11,12 +13,22 @@ import java.util.ResourceBundle;
  */
 public class FlightRawDataController  implements Initializable {
 
+
+    //TableColumn<>
+
+    private Dataset theDataSet = null;
     App parent;
 
+
     public void setApp(App parent){
         this.parent = parent;
     }
 
+    //public void loadTables() {
+
+    //}
+
+
     public void initialize(URL arg0, ResourceBundle arg1) {
         // TODO Auto-generated method stub
 
diff --git a/src/main/resources/flight_raw_data.fxml b/src/main/resources/flight_raw_data.fxml
index fe2c77d..eb34aba 100644
--- a/src/main/resources/flight_raw_data.fxml
+++ b/src/main/resources/flight_raw_data.fxml
@@ -10,62 +10,92 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.FlightRawDataController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.FlightRawDataController">
    <children>
-      <AnchorPane prefHeight="371.0" prefWidth="600.0">
-         <children>
-            <HBox prefHeight="300.0" prefWidth="583.0">
+      <ScrollPane hbarPolicy="NEVER" prefHeight="603.0" prefWidth="751.0" vbarPolicy="ALWAYS">
+         <content>
+            <AnchorPane prefHeight="371.0" prefWidth="600.0">
                <children>
-                  <AnchorPane prefHeight="300.0" prefWidth="330.0">
+                  <GridPane prefHeight="600.0" prefWidth="800.0">
+                    <columnConstraints>
+                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints maxHeight="193.0" minHeight="10.0" prefHeight="33.0" vgrow="SOMETIMES" />
+                      <RowConstraints maxHeight="193.0" minHeight="10.0" prefHeight="73.0" vgrow="SOMETIMES" />
+                      <RowConstraints maxHeight="504.0" minHeight="10.0" prefHeight="434.0" vgrow="SOMETIMES" />
+                      <RowConstraints maxHeight="62.0" minHeight="10.0" prefHeight="62.0" vgrow="SOMETIMES" />
+                    </rowConstraints>
                      <children>
-                        <Pane layoutY="-6.0" prefHeight="60.0" prefWidth="274.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="309.0" AnchorPane.topAnchor="0.0">
+                        <GridPane GridPane.rowIndex="2">
+                          <columnConstraints>
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="393.0" minWidth="10.0" prefWidth="150.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="651.0" minWidth="10.0" prefWidth="650.0" />
+                          </columnConstraints>
+                          <rowConstraints>
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                          </rowConstraints>
                            <children>
-                              <Text layoutX="15.0" layoutY="40.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Flight Raw Data">
-                                 <font>
-                                    <Font size="29.0" />
-                                 </font>
-                              </Text>
-                           </children>
-                        </Pane>
-                        <Pane layoutY="52.0" prefHeight="240.0" prefWidth="583.0" AnchorPane.bottomAnchor="0.0">
-                           <children>
-                              <Pane layoutX="15.0" prefHeight="220.0" prefWidth="120.0">
+                              <Pane prefHeight="434.0" prefWidth="304.0">
                                  <children>
-                                    <ScrollBar layoutX="100.0" orientation="VERTICAL" prefHeight="240.0" prefWidth="17.0" />
-                                    <ListView prefHeight="240.0" prefWidth="100.0" />
-                                    <Group layoutX="60.0" layoutY="31.0" />
+                                    <ListView layoutX="25.0" prefHeight="411.0" prefWidth="100.0">
+                                       <padding>
+                                          <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                                       </padding>
+                                    </ListView>
                                  </children>
                               </Pane>
-                              <ScrollPane layoutX="141.0" prefHeight="240.0" prefWidth="430.0">
-                                 <content>
-                                    <TableView prefHeight="238.0" prefWidth="750.0">
-                                      <columns>
-                                        <TableColumn prefWidth="75.0" text="ID" />
-                                        <TableColumn prefWidth="75.0" text="Type" />
-                                          <TableColumn prefWidth="75.0" text="Via" />
-                                          <TableColumn prefWidth="75.0" text="Altitude" />
-                                          <TableColumn prefWidth="75.0" text="Latitude" />
-                                          <TableColumn prefWidth="75.0" text="Longitude" />
-                                          <TableColumn prefWidth="75.0" text="Leg Dist" />
-                                          <TableColumn prefWidth="75.0" text="Tot Dist" />
-                                          <TableColumn prefWidth="75.0" text="Heading (True)" />
-                                          <TableColumn prefWidth="75.0" text="Name" />
-                                      </columns>
-                                    </TableView>
-                                 </content>
-                              </ScrollPane>
+                              <GridPane prefHeight="473.0" prefWidth="650.0" GridPane.columnIndex="1">
+                                <columnConstraints>
+                                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="617.0" minWidth="10.0" prefWidth="607.0" />
+                                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="318.0" minWidth="10.0" prefWidth="43.0" />
+                                </columnConstraints>
+                                <rowConstraints>
+                                  <RowConstraints maxHeight="414.0" minHeight="10.0" prefHeight="374.0" vgrow="SOMETIMES" />
+                                  <RowConstraints maxHeight="137.0" minHeight="1.0" prefHeight="60.0" vgrow="SOMETIMES" />
+                                </rowConstraints>
+                                 <children>
+                                    <ScrollPane prefHeight="292.0" prefWidth="650.0">
+                                       <content>
+                                          <TableView>
+                                            <columns>
+                                              <TableColumn prefWidth="75.0" text="ID" />
+                                                <TableColumn prefWidth="100.0" text="Name" />
+                                              <TableColumn prefWidth="75.0" text="Type" />
+                                                <TableColumn prefWidth="100.0" text="Via" />
+                                                <TableColumn prefWidth="75.0" text="Altitude" />
+                                                <TableColumn prefWidth="100.0" text="Latitude" />
+                                                <TableColumn prefWidth="100.0" text="Longitude" />
+                                                <TableColumn prefWidth="100.0" text="Heading" />
+                                                <TableColumn prefWidth="75.0" text="Leg Dist" />
+                                                <TableColumn prefWidth="75.0" text="Tot Dist" />
+                                            </columns>
+                                          </TableView>
+                                       </content>
+                                    </ScrollPane>
+                                    <Pane GridPane.rowIndex="1">
+                                       <children>
+                                          <Button layoutX="540.0" layoutY="10.0" mnemonicParsing="false" text="Analyse" GridPane.rowIndex="1" />
+                                       </children>
+                                    </Pane>
+                                 </children>
+                              </GridPane>
+                           </children>
+                        </GridPane>
+                        <Pane prefHeight="135.0" prefWidth="400.0" GridPane.rowIndex="1">
+                           <children>
+                              <Text layoutX="24.0" layoutY="45.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Flight Raw Data">
+                                 <font>
+                                    <Font size="48.0" />
+                                 </font>
+                              </Text>
                            </children>
-                           <padding>
-                              <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                           </padding>
                         </Pane>
                      </children>
-                  </AnchorPane>
+                  </GridPane>
                </children>
-            </HBox>
-            <ScrollBar layoutX="583.0" orientation="VERTICAL" prefHeight="371.0" prefWidth="17.0" />
-            <Button layoutX="501.0" layoutY="315.0" mnemonicParsing="false" text="Analyse" />
-         </children>
-      </AnchorPane>
+            </AnchorPane>
+         </content>
+      </ScrollPane>
    </children>
 </VBox>