fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the via column in the table

Browse Source
This commit is contained in:
Liam Beckett
2016-10-01 16:00:43 +13:00
parent 6ec38bcb87
commit 04481661c4
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng202/group9/GUI/FlightRDController.java
+1 -7
View File
@@ -37,8 +37,6 @@ public class FlightRDController extends Controller {
@FXML @FXML
private TableColumn<FlightPoint, String> flightTypeCol; private TableColumn<FlightPoint, String> flightTypeCol;
@FXML @FXML
private TableColumn<FlightPoint, String> flightViaCol;
@FXML
private TableColumn<FlightPoint, String> flightAltitudeCol; private TableColumn<FlightPoint, String> flightAltitudeCol;
@FXML @FXML
private TableColumn<FlightPoint, String> flightLatCol; private TableColumn<FlightPoint, String> flightLatCol;
@@ -60,8 +58,6 @@ public class FlightRDController extends Controller {
@FXML @FXML
private TextField flightTypeBox; private TextField flightTypeBox;
@FXML @FXML
private TextField flightViaBox;
@FXML
private TextField flightAltitudeBox; private TextField flightAltitudeBox;
@FXML @FXML
private TextField flightLatitudeBox; private TextField flightLatitudeBox;
@@ -128,7 +124,6 @@ public class FlightRDController extends Controller {
flightIdCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("ID")); flightIdCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("ID"));
flightNameCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Name")); flightNameCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Name"));
flightTypeCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Type")); flightTypeCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Type"));
flightViaCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Via"));
flightAltitudeCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Altitude")); flightAltitudeCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Altitude"));
flightLatCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Latitude")); flightLatCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Latitude"));
flightLongCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Longitude")); flightLongCol.setCellValueFactory(new PropertyValueFactory<FlightPoint, String>("Longitude"));
@@ -151,7 +146,7 @@ public class FlightRDController extends Controller {
theDataSet.addFlightPointToPath(currentPathId, theDataSet.addFlightPointToPath(currentPathId,
flightNameBox.getText(), flightNameBox.getText(),
flightTypeBox.getText(), flightTypeBox.getText(),
flightViaBox.getText(), "",
flightAltitudeBox.getText(), flightAltitudeBox.getText(),
flightLatitudeBox.getText(), flightLatitudeBox.getText(),
flightLongitudeBox.getText(), flightLongitudeBox.getText(),
@@ -160,7 +155,6 @@ public class FlightRDController extends Controller {
flightTotDistBox.getText()); flightTotDistBox.getText());
flightNameBox.clear(); flightNameBox.clear();
flightTypeBox.clear(); flightTypeBox.clear();
flightViaBox.clear();
flightAltitudeBox.clear(); flightAltitudeBox.clear();
flightLatitudeBox.clear(); flightLatitudeBox.clear();
flightLongitudeBox.clear(); flightLongitudeBox.clear();
src/main/resources/flight_raw_data.fxml
+6 -12
View File
@@ -78,7 +78,7 @@
<content> <content>
<Pane layoutY="25.0"> <Pane layoutY="25.0">
<children> <children>
<TextField fx:id="flightLatitudeBox" layoutX="440.0" prefHeight="25.0" prefWidth="100.0" promptText="Latitude"> <TextField fx:id="flightLatitudeBox" layoutX="340.0" prefHeight="25.0" prefWidth="100.0" promptText="Latitude">
<padding> <padding>
<Insets left="2.0" right="2.0" /> <Insets left="2.0" right="2.0" />
</padding> </padding>
@@ -88,23 +88,18 @@
<Insets left="2.0" right="2.0" /> <Insets left="2.0" right="2.0" />
</padding> </padding>
</TextField> </TextField>
<TextField fx:id="flightAltitudeBox" layoutX="365.0" prefHeight="25.0" prefWidth="75.0" promptText="Altitude"> <TextField fx:id="flightAltitudeBox" layoutX="265.0" prefHeight="25.0" prefWidth="75.0" promptText="Altitude">
<padding> <padding>
<Insets left="2.0" right="2.0" /> <Insets left="2.0" right="2.0" />
</padding> </padding>
</TextField> </TextField>
<Label prefHeight="25.0" prefWidth="90.0" text="Enter Values:" /> <Label prefHeight="25.0" prefWidth="90.0" text="Enter Values:" />
<TextField fx:id="flightViaBox" layoutX="265.0" prefHeight="25.0" prefWidth="100.0" promptText="Via"> <TextField fx:id="flightHeadingBox" layoutX="540.0" prefHeight="25.0" prefWidth="100.0" promptText="Heading">
<padding> <padding>
<Insets left="2.0" right="2.0" /> <Insets left="2.0" right="2.0" />
</padding> </padding>
</TextField> </TextField>
<TextField fx:id="flightHeadingBox" layoutX="640.0" prefHeight="25.0" prefWidth="100.0" promptText="Heading"> <TextField fx:id="flightLongitudeBox" layoutX="440.0" prefHeight="25.0" prefWidth="100.0" promptText="Longitude">
<padding>
<Insets left="2.0" right="2.0" />
</padding>
</TextField>
<TextField fx:id="flightLongitudeBox" layoutX="540.0" prefHeight="25.0" prefWidth="100.0" promptText="Longitude">
<padding> <padding>
<Insets left="2.0" right="2.0" /> <Insets left="2.0" right="2.0" />
</padding> </padding>
@@ -114,12 +109,12 @@
<Insets left="2.0" right="2.0" /> <Insets left="2.0" right="2.0" />
</padding> </padding>
</TextField> </TextField>
<TextField fx:id="flightLegDistBox" layoutX="740.0" prefHeight="25.0" prefWidth="75.0" promptText="Leg Dist"> <TextField fx:id="flightLegDistBox" layoutX="640.0" prefHeight="25.0" prefWidth="75.0" promptText="Leg Dist">
<padding> <padding>
<Insets left="2.0" right="2.0" /> <Insets left="2.0" right="2.0" />
</padding> </padding>
</TextField> </TextField>
<TextField fx:id="flightTotDistBox" layoutX="815.0" prefHeight="25.0" prefWidth="75.0" promptText="Tot Dist"> <TextField fx:id="flightTotDistBox" layoutX="715.0" prefHeight="25.0" prefWidth="75.0" promptText="Tot Dist">
<padding> <padding>
<Insets left="2.0" right="2.0" /> <Insets left="2.0" right="2.0" />
</padding> </padding>
@@ -142,7 +137,6 @@
<TableColumn fx:id="flightIdCol" prefWidth="90.0" text="ID" /> <TableColumn fx:id="flightIdCol" prefWidth="90.0" text="ID" />
<TableColumn fx:id="flightNameCol" prefWidth="100.0" text="Name" /> <TableColumn fx:id="flightNameCol" prefWidth="100.0" text="Name" />
<TableColumn fx:id="flightTypeCol" prefWidth="75.0" text="Type" /> <TableColumn fx:id="flightTypeCol" prefWidth="75.0" text="Type" />
<TableColumn fx:id="flightViaCol" prefWidth="100.0" text="Via" />
<TableColumn fx:id="flightAltitudeCol" prefWidth="75.0" text="Altitude" /> <TableColumn fx:id="flightAltitudeCol" prefWidth="75.0" text="Altitude" />
<TableColumn fx:id="flightLatCol" prefWidth="100.0" text="Latitude" /> <TableColumn fx:id="flightLatCol" prefWidth="100.0" text="Latitude" />
<TableColumn fx:id="flightLongCol" prefWidth="100.0" text="Longitude" /> <TableColumn fx:id="flightLongCol" prefWidth="100.0" text="Longitude" />