 Liam Beckett
|
af8617b316
|
Commented out tests in the App
|
2016-09-14 10:30:27 +12:00 |
|
|
Liam Beckett
|
13697ac673
|
Implemented the parser for basic Flight files(The one given to us in the important documents folder on learn)
|
2016-09-14 10:22:01 +12:00 |
|
|
Liam Beckett
|
b6624f20a8
|
Updated the Flight Summary GUI
|
2016-09-14 08:29:01 +12:00 |
|
|
Liam Beckett
|
3be9fca029
|
Added back in the GUI implementation for the flight raw data and summary viewer which was lost / changed earlier. Also in the process of updating their fxml files to improve the GUI
|
2016-09-13 21:01:58 +12:00 |
|
|
Liam Beckett
|
9c594fd474
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/seng202/group9/GUI/MenuController.java
|
2016-09-13 16:42:33 +12:00 |
|
|
Liam Beckett
|
3e5b793cb2
|
Trying to fix the merge conflict
|
2016-09-13 16:39:22 +12:00 |
|
|
Liam Beckett
|
a46609b0b2
|
Begun work on the flight data parser, committing changes and merging in order to add another feature.
|
2016-09-13 16:24:43 +12:00 |
|
|
Liam Beckett
|
b7674fc8ea
|
Added in the Raw Flight Data page which now appears as a new window something again we will need to fix, have updated the menu.fxml document to include the tags for the two menu buttons for flight. Have realized that I will have to rework the GUI so that it scales better.
|
2016-09-13 13:46:25 +12:00 |
|
|
Liam Beckett
|
83ccf04d85
|
Implemented the GUI to open for the Flight Data Summary page however was unable to get it to open in the same stage so it opens in a new window. This is something to address later.
|
2016-09-13 13:23:44 +12:00 |
|
|
Liam Beckett
|
ef3028c8c4
|
Merge branch 'ImplementFlightGUI' into 'master'
Added in the drop down menu for the view tab on the menu bar. This provides indi…
Didnt mean to branch off at this point
See merge request !1
|
2016-09-13 11:07:16 +12:00 |
|
|
Liam
|
9cc02bb305
|
Added in the drop down menu for the view tab on the menu bar. This provides individual links to the different GUI pages.
|
2016-09-13 11:05:36 +12:00 |
|
|
Liam
|
8111b9d35d
|
Added in the GUI template for the raw flight data view.
|
2016-08-19 12:29:02 +12:00 |
|
|
Liam
|
c3a6dd406b
|
Added in the GUI template for the flight data summary.
|
2016-08-19 12:28:36 +12:00 |
|