Delete Comments and Created Graphs Skeleton
This commit is contained in:
@@ -1,15 +1,26 @@
|
|||||||
package seng202.group9.GUI;
|
package seng202.group9.GUI;
|
||||||
|
|
||||||
|
import javafx.fxml.FXML;
|
||||||
|
import javafx.scene.layout.GridPane;
|
||||||
|
import seng202.group9.Controller.Dataset;
|
||||||
import seng202.group9.Controller.SceneCode;
|
import seng202.group9.Controller.SceneCode;
|
||||||
|
import seng202.group9.Controller.Session;
|
||||||
|
|
||||||
|
import static javafx.application.ConditionalFeature.FXML;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by Gondr on 2/10/2016.
|
* Created by Gondr on 2/10/2016.
|
||||||
*/
|
*/
|
||||||
public class AirlineGraphController extends Controller{
|
public class AirlineGraphController extends Controller{
|
||||||
|
private Dataset dataset;
|
||||||
|
private Session session;
|
||||||
|
@FXML
|
||||||
|
private GridPane chartContainer;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void load() {
|
public void load() {
|
||||||
|
dataset = getParent().getCurrentDataset();
|
||||||
|
session = getParent().getSession();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void goToRawData(){
|
public void goToRawData(){
|
||||||
|
|||||||
@@ -1,7 +1,27 @@
|
|||||||
package seng202.group9.GUI;
|
package seng202.group9.GUI;
|
||||||
|
|
||||||
|
import javafx.fxml.FXML;
|
||||||
|
import javafx.scene.layout.GridPane;
|
||||||
|
import seng202.group9.Controller.Dataset;
|
||||||
|
import seng202.group9.Controller.SceneCode;
|
||||||
|
import seng202.group9.Controller.Session;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by Gondr on 2/10/2016.
|
* Created by Gondr on 2/10/2016.
|
||||||
*/
|
*/
|
||||||
public class AirportGraphController {
|
public class AirportGraphController extends Controller{
|
||||||
|
private Dataset dataset;
|
||||||
|
private Session session;
|
||||||
|
@FXML
|
||||||
|
private GridPane chartContainer;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void load() {
|
||||||
|
dataset = getParent().getCurrentDataset();
|
||||||
|
session = getParent().getSession();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void goToRawData(){
|
||||||
|
replaceSceneContent(SceneCode.AIRPORT_RAW_DATA);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -87,8 +87,6 @@ public class RouteFilterController extends Controller {
|
|||||||
alert.setContentText("Your route data has been successfully filtered.");
|
alert.setContentText("Your route data has been successfully filtered.");
|
||||||
alert.showAndWait();
|
alert.showAndWait();
|
||||||
|
|
||||||
//currentSession.setFilteredAirlines(FXCollections.observableArrayList(filter.getFilteredData()));
|
|
||||||
//routeAirline + routeSourceAirport + routeArrvAirport + routeCodeShare + routeStops + routeEquip
|
|
||||||
HashMap<Integer, Integer> routesHM = new HashMap<Integer, Integer>();
|
HashMap<Integer, Integer> routesHM = new HashMap<Integer, Integer>();
|
||||||
ArrayList<Route> routes = filter.getFilteredData();
|
ArrayList<Route> routes = filter.getFilteredData();
|
||||||
for (int index = 0; index < routes.size(); index++) {
|
for (int index = 0; index < routes.size(); index++) {
|
||||||
|
|||||||
@@ -1,7 +1,27 @@
|
|||||||
package seng202.group9.GUI;
|
package seng202.group9.GUI;
|
||||||
|
|
||||||
|
import javafx.fxml.FXML;
|
||||||
|
import javafx.scene.layout.GridPane;
|
||||||
|
import seng202.group9.Controller.Dataset;
|
||||||
|
import seng202.group9.Controller.SceneCode;
|
||||||
|
import seng202.group9.Controller.Session;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by Gondr on 2/10/2016.
|
* Created by Gondr on 2/10/2016.
|
||||||
*/
|
*/
|
||||||
public class RouteGraphController {
|
public class RouteGraphController extends Controller{
|
||||||
|
private Dataset dataset;
|
||||||
|
private Session session;
|
||||||
|
@FXML
|
||||||
|
private GridPane chartContainer;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void load() {
|
||||||
|
dataset = getParent().getCurrentDataset();
|
||||||
|
session = getParent().getSession();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void goToRawData(){
|
||||||
|
replaceSceneContent(SceneCode.ROUTE_RAW_DATA);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user