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

Merge branch 'WIP_Summary'

Browse Source 
Conflicts:
	res/userdb.db
	src/main/resources/airline_summary.fxml
	src/main/resources/airport_summary.fxml
This commit is contained in:
Michael
2016-09-15 16:08:30 +12:00
parent cd1c505dc6 3782334db7
commit e914c50498
7 changed files with 186 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/menu.fxml
+4 -4
View File
@@ -6,7 +6,7 @@
<?import javafx.scene.control.SeparatorMenuItem?>
<?import javafx.scene.layout.VBox?>
<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.MenuController">
<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.MenuController">
<children>
<MenuBar>
<menus>
@@ -24,19 +24,19 @@
<items>
<Menu mnemonicParsing="false" text="Airport">
<items>
<MenuItem mnemonicParsing="false" text="Summary" />
<MenuItem mnemonicParsing="false" onAction="#viewAirportSummary" text="Summary" />
<MenuItem mnemonicParsing="false" onAction="#viewAirportRawData" text="Raw Data" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Airline">
<items>
<MenuItem mnemonicParsing="false" text="Summary" />
<MenuItem mnemonicParsing="false" onAction="#viewAirlineSummary" text="Summary" />
<MenuItem mnemonicParsing="false" onAction="#viewAirlineRawData" text="Raw Data" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Route">
<items>
<MenuItem mnemonicParsing="false" text="Summary" />
<MenuItem mnemonicParsing="false" onAction="#viewRouteSummary" text="Summary" />
<MenuItem mnemonicParsing="false" onAction="#viewRouteRawData" text="Raw Data" />
</items>
</Menu>
src/main/resources/routes_summary.fxml
+9 -15
View File
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.shape.*?>
<?import javafx.scene.text.*?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ListView?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.TextArea?>
<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
@@ -19,7 +13,7 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.FlightSummaryController">
<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.RouteSummaryController">
<children>
<ScrollPane prefHeight="800.0" prefWidth="800.0">
<content>
@@ -42,13 +36,13 @@
<children>
<Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0">
<children>
<TableView prefHeight="200.0" prefWidth="378.0">
<TableView fx:id="tableView" prefHeight="200.0" prefWidth="378.0">
<columns>
<TableColumn prefWidth="75.0" text="Name" />
<TableColumn prefWidth="75.0" text="City" />
<TableColumn prefWidth="75.0" text="Country" />
<TableColumn prefWidth="75.0" text="Altitude" />
<TableColumn prefWidth="75.0" text="IATA/FAA" />
<TableColumn fx:id="columnAirline" prefWidth="75.0" text="Airline" />
<TableColumn fx:id="columnDepart" prefWidth="75.0" text="Depart" />
<TableColumn fx:id="columnArrive" prefWidth="75.0" text="Arrive" />
<TableColumn fx:id="columnStops" prefWidth="75.0" text="Stops" />
<TableColumn fx:id="columnEquipment" prefWidth="75.0" text="Equipment" />
</columns>
</TableView>
</children>