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

Fixed some previously unknown issues from merging.

Browse Source
main
Michael Wilson 9 years ago
parent 8a4134ae4c
commit 744b96c42a
5 changed files with 5 additions and 48 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/seng202/group9/GUI/AirportRDController.java
Unescape View File

@ -216,4 +216,5 @@ public class AirportRDController extends Controller{
}
tableViewAirportRD.setItems(FXCollections.<Airport>observableArrayList(filter.getFilteredData()));
}
public void analyse_Button(){ replaceSceneContent(SceneCode.AIRPORT_ANALYSER);}
}

2
src/main/java/seng202/group9/GUI/AirportSummaryController.java
Unescape View File

@ -40,7 +40,7 @@ public class AirportSummaryController extends Controller{
private Map map;
public void airportRawDataButton() {
replaceSceneContent(SceneCode.AIRLINE_RAW_DATA);
replaceSceneContent(SceneCode.AIRPORT_RAW_DATA);
}
public void flightSummaryButton() {
replaceSceneContent(SceneCode.FLIGHT_SUMMARY);

3
src/main/resources/airport_analyser.fxml
Unescape View File

@ -28,7 +28,8 @@
<Pane layoutX="15.0" layoutY="60.0" prefHeight="403.0" prefWidth="772.0">
<children>
<PieChart fx:id="pieGraph" prefHeight="400.0" prefWidth="772.0" title="Airports per country" />
</children></Pane>
</children>
</Pane>
</children>
</Pane>
</children>

45
src/main/resources/airport_pie.fxml
Unescape View File

@ -1,45 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.chart.BarChart?>
<?import javafx.scene.chart.CategoryAxis?>
<?import javafx.scene.chart.NumberAxis?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.text.Font?>
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="568.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.RouteAnalyser">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="457.0" minHeight="10.0" prefHeight="403.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="457.0" minHeight="10.0" prefHeight="403.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Pane prefHeight="510.0" prefWidth="800.0" GridPane.columnSpan="2" GridPane.rowSpan="2">
<children>
<Label layoutX="14.0" layoutY="14.0" text="Route Analyser">
<font>
<Font size="29.0" />
</font>
</Label>
<Pane layoutX="16.0" layoutY="53.0" prefHeight="403.0" prefWidth="765.0">
<children>
<BarChart fx:id="analyserGraph" prefHeight="403.0" prefWidth="740.0" title="Routes Arriving at or Departing from each Airport">
<xAxis>
<CategoryAxis label="Airports" side="BOTTOM" />
</xAxis>
<yAxis>
<NumberAxis label="Number" side="LEFT" />
</yAxis>
</BarChart>
</children>
</Pane>
</children>
</Pane>
</children>
</GridPane>

2
src/main/resources/airport_raw_data.fxml
Unescape View File

@ -93,7 +93,7 @@
</Pane>
</content>
</ScrollPane>
<Button layoutX="14.0" layoutY="526.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
<Button layoutX="14.0" layoutY="526.0" mnemonicParsing="false" onAction="#analyse_Button" prefHeight="25.0" prefWidth="125.0" text="Analyse" />
<Button layoutX="653.0" layoutY="526.0" mnemonicParsing="false" onAction="#addAirportSingle" prefHeight="25.0" prefWidth="125.0" text="Add" />
<Pane layoutX="15.0" layoutY="60.0" prefHeight="342.0" prefWidth="764.0">
<children>

Write Preview
Loading…
Cancel
Save