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

Fixed 2 incorrect buttons and hooked up flight buttons.

Browse Source
This commit is contained in:
Michael Wilson
2016-09-16 09:47:36 +12:00
parent 94f2d25899
commit 87d4b42036
3 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng202/group9/GUI/AirlineSummaryController.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class AirlineSummaryController extends MenuController{
} }
public void airlineRawDataButton() { public void airlineRawDataButton() {
try { try {
RouteRDController rawDataController = (RouteRDController) AirlineRDController rawDataController = (AirlineRDController)
parent.replaceSceneContent("airline_raw_data.fxml"); parent.replaceSceneContent("airline_raw_data.fxml");
rawDataController.setApp(parent); rawDataController.setApp(parent);
rawDataController.loadTables(); rawDataController.loadTables();
src/main/java/seng202/group9/GUI/FlightSummaryController.java
+34
View File
@@ -76,6 +76,40 @@ public class FlightSummaryController implements Initializable {
} }
} }
public void airportSummaryButton() {
try {
AirportSummaryController summaryController = (AirportSummaryController)
parent.replaceSceneContent("airport_summary.fxml");
summaryController.setApp(parent);
summaryController.loadTables();
}
catch (Exception e) {
e.printStackTrace();
}
}
public void routeSummaryButton() {
try {
RouteSummaryController summaryController = (RouteSummaryController)
parent.replaceSceneContent("routes_summary.fxml");
summaryController.setApp(parent);
summaryController.loadTables();
}
catch (Exception e) {
e.printStackTrace();
}
}
public void airlineSummaryButton() {
try {
AirlineSummaryController summaryController = (AirlineSummaryController)
parent.replaceSceneContent("airline_summary.fxml");
summaryController.setApp(parent);
summaryController.loadTables();
}
catch (Exception e) {
e.printStackTrace();
}
}
public void initialize(URL arg0, ResourceBundle arg1) { public void initialize(URL arg0, ResourceBundle arg1) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
src/main/resources/flight_data_summary.fxml
+18 -18
View File
@@ -83,24 +83,24 @@
</rowConstraints> </rowConstraints>
<children> <children>
<Pane prefHeight="160.0" prefWidth="295.0" GridPane.rowIndex="1"> <Pane prefHeight="160.0" prefWidth="295.0" GridPane.rowIndex="1">
<children> <children>
<Button layoutX="33.0" layoutY="82.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airports"> <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" onAction="#airportSummaryButton" prefHeight="25.0" prefWidth="65.0" text="Airports">
<font> <font>
<Font size="12.0" /> <Font size="12.0" />
</font> </font>
</Button> </Button>
<Button layoutX="126.0" layoutY="81.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Routes"> <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" onAction="#airlineSummaryButton" prefHeight="25.0" prefWidth="65.0" text="Airlines">
<font> <font>
<Font size="12.0" /> <Font size="12.0" />
</font> </font>
</Button> </Button>
<Button layoutX="218.0" layoutY="81.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airlines"> <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" onAction="#routeSummaryButton" prefHeight="25.0" prefWidth="65.0" text="Routes">
<font> <font>
<Font size="12.0" /> <Font size="12.0" />
</font> </font>
</Button> </Button>
<Button layoutX="33.0" layoutY="129.0" mnemonicParsing="false" onAction="#handleRawDataButton" prefHeight="25.0" prefWidth="250.0" text="Flight Raw Data" /> <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" onAction="#handleRawDataButton" prefHeight="25.0" prefWidth="214.0" text="Flights Raw Data" />
</children> </children>
<padding> <padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</padding> </padding>