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

CHanged chartContainer from GridPane to VBOx as it was more appropriate

Browse Source
This commit is contained in:
YaFedImYaEatIm
2016-10-03 00:02:05 +13:00
parent e15f1cc328
commit 6cea9f938f
6 changed files with 9 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng202/group9/GUI/AirlineGraphController.java
+2 -1
View File
@@ -2,6 +2,7 @@ package seng202.group9.GUI;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import javafx.scene.layout.VBox;
import seng202.group9.Controller.Dataset; import seng202.group9.Controller.Dataset;
import seng202.group9.Controller.SceneCode; import seng202.group9.Controller.SceneCode;
import seng202.group9.Controller.Session; import seng202.group9.Controller.Session;
@@ -15,7 +16,7 @@ public class AirlineGraphController extends Controller{
private Dataset dataset; private Dataset dataset;
private Session session; private Session session;
@FXML @FXML
private GridPane chartContainer; private VBox chartContainer;
@Override @Override
public void load() { public void load() {
src/main/java/seng202/group9/GUI/AirportGraphController.java
+2 -1
View File
@@ -2,6 +2,7 @@ package seng202.group9.GUI;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import javafx.scene.layout.VBox;
import seng202.group9.Controller.Dataset; import seng202.group9.Controller.Dataset;
import seng202.group9.Controller.SceneCode; import seng202.group9.Controller.SceneCode;
import seng202.group9.Controller.Session; import seng202.group9.Controller.Session;
@@ -13,7 +14,7 @@ public class AirportGraphController extends Controller{
private Dataset dataset; private Dataset dataset;
private Session session; private Session session;
@FXML @FXML
private GridPane chartContainer; private VBox chartContainer;
@Override @Override
public void load() { public void load() {
src/main/java/seng202/group9/GUI/RouteGraphController.java
+2 -1
View File
@@ -2,6 +2,7 @@ package seng202.group9.GUI;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import javafx.scene.layout.VBox;
import seng202.group9.Controller.Dataset; import seng202.group9.Controller.Dataset;
import seng202.group9.Controller.SceneCode; import seng202.group9.Controller.SceneCode;
import seng202.group9.Controller.Session; import seng202.group9.Controller.Session;
@@ -13,7 +14,7 @@ public class RouteGraphController extends Controller{
private Dataset dataset; private Dataset dataset;
private Session session; private Session session;
@FXML @FXML
private GridPane chartContainer; private VBox chartContainer;
@Override @Override
public void load() { public void load() {
src/main/resources/airline_graphs.fxml
+1 -13
View File
@@ -42,19 +42,7 @@
</Button> </Button>
<ScrollPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1"> <ScrollPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
<content> <content>
<GridPane fx:id="chartContainer"> <VBox fx:id="chartContainer" prefHeight="200.0" prefWidth="100.0" />
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
</GridPane>
</content> </content>
</ScrollPane> </ScrollPane>
</children> </children>
src/main/resources/airport_graphs.fxml
+1 -10
View File
@@ -42,16 +42,7 @@
</Button> </Button>
<ScrollPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1"> <ScrollPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
<content> <content>
<GridPane fx:id="chartContainer"> <VBox fx:id="chartContainer" prefHeight="200.0" prefWidth="100.0" />
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
</GridPane>
</content> </content>
</ScrollPane> </ScrollPane>
</children> </children>
src/main/resources/route_graphs.fxml
+1 -10
View File
@@ -42,16 +42,7 @@
</Button> </Button>
<ScrollPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1"> <ScrollPane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
<content> <content>
<GridPane fx:id="chartContainer"> <VBox fx:id="chartContainer" prefHeight="200.0" prefWidth="100.0" />
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
</GridPane>
</content> </content>
</ScrollPane> </ScrollPane>
</children> </children>