YaFedImYaEatIm
618afd4a92
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
9 years ago
Michael Wilson
02b484917d
Fixed calculation bug.
9 years ago
Michael Wilson
60b92d2170
Merge remote-tracking branch 'origin/master'
...
Conflicts:
src/main/java/seng202/group9/Controller/SceneCode.java
9 years ago
Liam Beckett
ffae933085
Database
9 years ago
Sunguin Peng
b2cba96dc1
Added javadoc for airline, airport and route raw data controller classes.
9 years ago
YaFedImYaEatIm
724f63956a
Added Javadoc Strings for Some functions
9 years ago
YaFedImYaEatIm
9e00e3666f
Fixed Conflicts when merging ConnectMaps
9 years ago
Michael Wilson
ff79599c9b
Calculator Implimented.
9 years ago
Sunguin Peng
37e712f734
Refactoring bugs fixed again
9 years ago
YaFedImYaEatIm
84e273de1f
Merge branch 'ConnectMaps'
9 years ago
YaFedImYaEatIm
5363cf8b4e
COnnected maps to airlines, Airports and ROutes
9 years ago
Sunguin Peng
50cc5c6dfb
Merging filter complete GUI for Airport, Airline and Route Raw Data
9 years ago
Liam Beckett
4d662be24a
Layout change
9 years ago
Sunguin Peng
1feb1c9153
Added filter function to the Airline GUI
9 years ago
Liam Beckett
bf33ec61c7
Merge fix
9 years ago
Liam Beckett
1664a49623
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/main/java/seng202/group9/GUI/FlightSummaryController.java
9 years ago
Liam Beckett
cd8e2b0c7f
Implemented the delete option for the flight paths on the Summary and Raw Data pages.
9 years ago
YaFedImYaEatIm
44ed68ee7a
Added Google Maps API
9 years ago
YaFedImYaEatIm
a9edea7690
Finished Google Maps API
9 years ago
Liam Beckett
62a93ad629
Implemented right click, delete ability for the flight raw data paths
9 years ago
Michael Wilson
548ffa99f1
Added webveiws for later maps implimentation.
9 years ago
Sunguin Peng
30f7b2d842
Fixed a bug from Route Filter and implemented Airport Filter in GUI
9 years ago
Liam Beckett
3508518cdd
Added in the right click, delete option for the flight points in the table.
9 years ago
Liam Beckett
be3413a373
Merge branch 'WIP_Update_list' into 'master'
...
update list
See merge request !13
9 years ago
Liam Beckett
afc7d1472f
Merge remote-tracking branch 'remotes/origin/master' into WIP_Update_list
9 years ago
Liam Beckett
42bbb327c4
Database
9 years ago
Liam Beckett
7333620964
Fixed the list view bug, so it will now reload the list view so that it includes the newly added path.
9 years ago
YaFedImYaEatIm
ae3fbefd0d
Initial load for GoogleMaps done
9 years ago
Sunguin Peng
4fde239167
Route Filtering on GUI
9 years ago
Michael Wilson
8c49ce4455
Merge remote-tracking branch 'origin/master'
9 years ago
Michael Wilson
3218b72941
Created pie graph viewer for Airports.
9 years ago
Liam Beckett
d838274065
Merge branch 'WIP_Flight_Add_Path' into 'master'
...
Implements the button 'new' on the Flight raw data page which can be used to cre…
…ate a new blank path. Currently does not reload the list view of paths to include the new path.
See merge request !12
9 years ago
Liam Beckett
23bebdf8e3
Implements the button 'new' on the Flight raw data page which can be used to create a new blank path. Currently does not reload the list view of paths to include the new path.
9 years ago
YaFedImYaEatIm
2613489dad
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
...
Conflicts:
res/session.ser
9 years ago
YaFedImYaEatIm
cbfe40a8fd
Edited Session Message as Importer Error messages
9 years ago
YaFedImYaEatIm
03bac3b6dd
Made it so that the session file is ignored
9 years ago
Sunguin Peng
5cc305d896
Fixed some refactoring issues and implemented delete functions in the GUI
9 years ago
Michael Wilson
8b30d2c0c2
Merge remote-tracking branch 'origin/master'
9 years ago
Michael Wilson
eb698f17c8
Made graph work with new formatting.
9 years ago
YaFedImYaEatIm
8027b701a0
Added Import UI
9 years ago
Michael Wilson
56eeb0e9f8
Merge branch 'Analyser'
...
Conflicts:
src/main/java/seng202/group9/GUI/RouteRDController.java
9 years ago
Michael Wilson
f0fbc7cf24
Small check added.
9 years ago
Sunguin Peng
e3ff9d3bfc
Fixed a bit of Airline GUI
9 years ago
YaFedImYaEatIm
00333b6e58
Added Session and Controller Abstract Class
9 years ago
YaFedImYaEatIm
4ff6aefd1e
Implemented Abstract Controller class which made code a lot short and easier to read
9 years ago
YaFedImYaEatIm
5641cc3728
Loaded Observers to Session loading
9 years ago
YaFedImYaEatIm
bf8c1d1fdf
Added Serialisation for the Session Code
9 years ago
YaFedImYaEatIm
d0148d9e73
Added Enums for each Open View for easier storage for Session.
9 years ago
Liam Beckett
68081c664e
Merge branch 'WIP_Flights_Adder' into 'master'
...
Flights adder
See merge request !11
9 years ago
Liam Beckett
25fcc8cf94
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
...
# Conflicts:
# res/userdb.db
9 years ago