From 6cea9f938fef816af912e5199919d21680522a4f Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Mon, 3 Oct 2016 00:02:05 +1300 Subject: [PATCH] CHanged chartContainer from GridPane to VBOx as it was more appropriate --- .../seng202/group9/GUI/AirlineGraphController.java | 3 ++- .../seng202/group9/GUI/AirportGraphController.java | 3 ++- .../seng202/group9/GUI/RouteGraphController.java | 3 ++- src/main/resources/airline_graphs.fxml | 14 +------------- src/main/resources/airport_graphs.fxml | 11 +---------- src/main/resources/route_graphs.fxml | 11 +---------- 6 files changed, 9 insertions(+), 36 deletions(-) diff --git a/src/main/java/seng202/group9/GUI/AirlineGraphController.java b/src/main/java/seng202/group9/GUI/AirlineGraphController.java index 1a682bd..eaf9994 100644 --- a/src/main/java/seng202/group9/GUI/AirlineGraphController.java +++ b/src/main/java/seng202/group9/GUI/AirlineGraphController.java @@ -2,6 +2,7 @@ package seng202.group9.GUI; import javafx.fxml.FXML; import javafx.scene.layout.GridPane; +import javafx.scene.layout.VBox; import seng202.group9.Controller.Dataset; import seng202.group9.Controller.SceneCode; import seng202.group9.Controller.Session; @@ -15,7 +16,7 @@ public class AirlineGraphController extends Controller{ private Dataset dataset; private Session session; @FXML - private GridPane chartContainer; + private VBox chartContainer; @Override public void load() { diff --git a/src/main/java/seng202/group9/GUI/AirportGraphController.java b/src/main/java/seng202/group9/GUI/AirportGraphController.java index 6b9d0d1..77f08b2 100644 --- a/src/main/java/seng202/group9/GUI/AirportGraphController.java +++ b/src/main/java/seng202/group9/GUI/AirportGraphController.java @@ -2,6 +2,7 @@ package seng202.group9.GUI; import javafx.fxml.FXML; import javafx.scene.layout.GridPane; +import javafx.scene.layout.VBox; import seng202.group9.Controller.Dataset; import seng202.group9.Controller.SceneCode; import seng202.group9.Controller.Session; @@ -13,7 +14,7 @@ public class AirportGraphController extends Controller{ private Dataset dataset; private Session session; @FXML - private GridPane chartContainer; + private VBox chartContainer; @Override public void load() { diff --git a/src/main/java/seng202/group9/GUI/RouteGraphController.java b/src/main/java/seng202/group9/GUI/RouteGraphController.java index f4d74f7..dd85323 100644 --- a/src/main/java/seng202/group9/GUI/RouteGraphController.java +++ b/src/main/java/seng202/group9/GUI/RouteGraphController.java @@ -2,6 +2,7 @@ package seng202.group9.GUI; import javafx.fxml.FXML; import javafx.scene.layout.GridPane; +import javafx.scene.layout.VBox; import seng202.group9.Controller.Dataset; import seng202.group9.Controller.SceneCode; import seng202.group9.Controller.Session; @@ -13,7 +14,7 @@ public class RouteGraphController extends Controller{ private Dataset dataset; private Session session; @FXML - private GridPane chartContainer; + private VBox chartContainer; @Override public void load() { diff --git a/src/main/resources/airline_graphs.fxml b/src/main/resources/airline_graphs.fxml index 91258ef..bdd5c01 100644 --- a/src/main/resources/airline_graphs.fxml +++ b/src/main/resources/airline_graphs.fxml @@ -42,19 +42,7 @@ - - - - - - - - - - - - - + diff --git a/src/main/resources/airport_graphs.fxml b/src/main/resources/airport_graphs.fxml index 3757c59..e6007c6 100644 --- a/src/main/resources/airport_graphs.fxml +++ b/src/main/resources/airport_graphs.fxml @@ -42,16 +42,7 @@ - - - - - - - - - - + diff --git a/src/main/resources/route_graphs.fxml b/src/main/resources/route_graphs.fxml index 2f3c6be..9f4d8e5 100644 --- a/src/main/resources/route_graphs.fxml +++ b/src/main/resources/route_graphs.fxml @@ -42,16 +42,7 @@ - - - - - - - - - - +