diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java index 25ab2dd..53dbfa1 100644 --- a/src/main/java/seng202/group9/GUI/FlightRDController.java +++ b/src/main/java/seng202/group9/GUI/FlightRDController.java @@ -37,8 +37,6 @@ public class FlightRDController extends Controller { @FXML private TableColumn flightTypeCol; @FXML - private TableColumn flightViaCol; - @FXML private TableColumn flightAltitudeCol; @FXML private TableColumn flightLatCol; @@ -60,8 +58,6 @@ public class FlightRDController extends Controller { @FXML private TextField flightTypeBox; @FXML - private TextField flightViaBox; - @FXML private TextField flightAltitudeBox; @FXML private TextField flightLatitudeBox; @@ -128,7 +124,6 @@ public class FlightRDController extends Controller { flightIdCol.setCellValueFactory(new PropertyValueFactory("ID")); flightNameCol.setCellValueFactory(new PropertyValueFactory("Name")); flightTypeCol.setCellValueFactory(new PropertyValueFactory("Type")); - flightViaCol.setCellValueFactory(new PropertyValueFactory("Via")); flightAltitudeCol.setCellValueFactory(new PropertyValueFactory("Altitude")); flightLatCol.setCellValueFactory(new PropertyValueFactory("Latitude")); flightLongCol.setCellValueFactory(new PropertyValueFactory("Longitude")); @@ -151,7 +146,7 @@ public class FlightRDController extends Controller { theDataSet.addFlightPointToPath(currentPathId, flightNameBox.getText(), flightTypeBox.getText(), - flightViaBox.getText(), + "", flightAltitudeBox.getText(), flightLatitudeBox.getText(), flightLongitudeBox.getText(), @@ -160,7 +155,6 @@ public class FlightRDController extends Controller { flightTotDistBox.getText()); flightNameBox.clear(); flightTypeBox.clear(); - flightViaBox.clear(); flightAltitudeBox.clear(); flightLatitudeBox.clear(); flightLongitudeBox.clear(); diff --git a/src/main/resources/flight_raw_data.fxml b/src/main/resources/flight_raw_data.fxml index 78a6df2..06111a4 100644 --- a/src/main/resources/flight_raw_data.fxml +++ b/src/main/resources/flight_raw_data.fxml @@ -78,7 +78,7 @@ - + @@ -88,23 +88,18 @@ - +