From 859b19f7d5f1d4035947a57397d83e359c6d751c Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Tue, 13 Sep 2016 18:22:28 +1200 Subject: [PATCH] Fixed Scene Loading --- res/userdb.db | Bin 4338688 -> 4353024 bytes .../java/seng202/group9/Controller/App.java | 24 +++++++++++------- .../seng202/group9/GUI/MenuController.java | 3 ++- src/main/resources/menu.fxml | 7 +++-- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index 478b2fe9b448203519c712b01f2da19452338f5d..5d9b977331a3de685a8b5aa40b644c534d7a2646 100644 GIT binary patch delta 2389 zcmZXUX-pJn7{_X*>JwQ$K~>!A5oiyp0B%CTfipW^d7xWq9N`sj0@(o*WWb|hAzNhM{psP$*MO~G2)vc>jbTvg+ zJ-V8zt7*ELuB%>M&Cu0MUCq)}pRP{T)ofkO`BwEy^_~GC8?Wb{n((gn|0#NxyZQyM z^~M)s8+5g&bdNsu7eIWCzk4+7mlM)j|5BFb@}BWvBzvR}#>NASCHIBP8%|y7@FTg2 zOC5oYooR8`@#J}Y=V4IF{s69j7w8(@?e|Z?bGzJsB|P5;&Irq0*~z_Mzfy#6Ub`|C zw|b5b;QBeYT*Y|@t}(t8*Ry;cuAlKTTt|5>u4lM}>!-#6Tt6|oPdynAAbE(41d$Mu zk0{7AqyU+Ys7N7FgcKtsNGUP{DMQMU3ZxRLLaLD(B#g{NYLN&s3#miuk=e)`WG*rf znU5?$8jyuZBhrL4BQ1$1<61#vRQh2u@#tQDxp+-_p~?2)V?0bq-ss;sAUxF`j0<;C*;;$J3f<{3HJ-c16S{GGh}=)LK7wBMgM23xy4!#d0FCYFPrw6P<*6&pd_j zVV)wx)jY)q?%zFfqES%RGx)eTs-AtUR6wbq$XU}u(-;m^DQmOFY8`lAc;W%y`$U3U{xX?HZzh2ZDnQ;gT#9DgA%qwEaImQuEavc>k)@FH?qNG?^! z<#cjc00TvG1LM<3CRgBjk<~&z+2kSHCJ(~pV!4`enRN0zTPF{|o>F;1?1I+B_&f^F zrSKdlJe$JxRv52W=jfc}=!}rgTGBa_bcRW14e6{VomHf>l5|#(&T>m0C@Y7m>~=>C{MP3+ZeoolTC;M$);EbT&9T7m&{RNu4n@`g3OJ zaPr1Dg!c~q!JR;APogzf85ZD|K&l5?^OQP#AiGrP&r=GawME;dU=5^|3mD5eT)6GiiW(9Tg z8g;Xrx>;s*vmkaui!k0p+1-@gMcJK{#mAfVc;wrun{Cw1R_bO8b+ehe*+kuJq;57) zH{I0Ddg`W&x>-lvbSArr-PAf6AE4|B%Jx(CIAxDHJsu^SN62QMW3!iR9(HUVBAW-v z<^jj%ezLibZ0>bz?n&B=alC)cEIVXo+95N8LZ+9Lo9VVjGtJg$rrH`!kFC+fr-P-@ goMLM<-L^(kvNf8btE1qXB6VMlB``(v?UQK~NzU zL(nxBf0jojuN5avuZ`0aSo0fC6yfKR|a0W|_@ z3t+OCeuu>Ilve2)7tKA@b3?gBjQ@qlvU{s)U9M+LFz5n(MW55BbdJur?2>tw&U)*@ zRB4-y)wPc22251v<_7#%E_=QzcS{R=ld`wJ{GPm?F&pKl!HS4%V>NNA{dM(a{|sT; z%Uo1u2Fx=|DVrY}-(B&e{m4Qb)gv1P&;itd8WEr%I*39jjG9n0il7#B2pvX8&{1>@ z9Y?LG4Yi{aD2ig}B#NU`r~{owou~_SqXg@Xu>kffr1P{-8^s-JGsJiSR{q)1+nt0d{Brc#Z>O}0C$^dG-)^z8ru diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java index 48b44ce..04a0939 100644 --- a/src/main/java/seng202/group9/Controller/App.java +++ b/src/main/java/seng202/group9/Controller/App.java @@ -26,6 +26,7 @@ public class App extends Application private ArrayList Datasets = new ArrayList(); private Dataset currentDataset = null; private Stage primaryStage = null; + private VBox mainContainer; public static void main( String[] args ) { @@ -38,8 +39,15 @@ public class App extends Application @Override public void start(Stage primaryStage) { this.primaryStage = primaryStage; + //load the menu and the first container try { - MenuController menuController = new MenuController(); + FXMLLoader loader = new FXMLLoader(); + InputStream in = getClass().getClassLoader().getResourceAsStream("menu.fxml"); + mainContainer = (VBox) loader.load(in); + Scene scene = new Scene(mainContainer, 800, 600); + primaryStage.setScene(scene); + primaryStage.sizeToScene(); + MenuController menuController = (MenuController) loader.getController(); menuController.setApp(this); replaceSceneContent("menu.fxml");//replace this to check your fxml file } catch (Exception e) { @@ -81,18 +89,16 @@ public class App extends Application public Initializable replaceSceneContent(String fxml) throws Exception { FXMLLoader loader = new FXMLLoader(); InputStream in = getClass().getClassLoader().getResourceAsStream(fxml); - InputStream menuIn = getClass().getClassLoader().getResourceAsStream("menu.fxml"); - VBox page; + Parent page; try { - page = (VBox) loader.load(menuIn); - Parent content = loader.load(getClass().getClassLoader().getResource(fxml)); - page.getChildren().add(content); + page = (Parent) loader.load(in); } finally { in.close(); } - Scene scene = new Scene(page, 800, 600); - primaryStage.setScene(scene); - primaryStage.sizeToScene(); + while(mainContainer.getChildren().size() > 1) { + mainContainer.getChildren().remove(1); + } + mainContainer.getChildren().add(page); return (Initializable) loader.getController(); } diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java index a31e214..af276d7 100644 --- a/src/main/java/seng202/group9/GUI/MenuController.java +++ b/src/main/java/seng202/group9/GUI/MenuController.java @@ -34,7 +34,8 @@ public class MenuController implements Initializable{ */ public void loadAirlineRaw(){ try { - parent.replaceSceneContent("airline_raw_data.fxml"); + parent.replaceSceneContent("menu.fxml"); + System.out.println("Loaded Airline Raw Data."); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/resources/menu.fxml b/src/main/resources/menu.fxml index 0233629..f9c28d5 100644 --- a/src/main/resources/menu.fxml +++ b/src/main/resources/menu.fxml @@ -1,12 +1,15 @@ + + + - + @@ -31,7 +34,7 @@ - +