From 5c71a95e6330e84267acb328488a0fb83d5a4f5d Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Tue, 13 Sep 2016 12:38:06 +1200 Subject: [PATCH 1/3] Added how to import this project. --- README.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.txt b/README.txt index 82dfda8..e722259 100644 --- a/README.txt +++ b/README.txt @@ -1,2 +1,6 @@ -This is a Flight Application Data Analyser. It runs on Java and has dependencys JavaFX and Maven. +This is a Flight Application Data Analyser. It runs on Java and has dependencys JavaFX, SQLITE3 and Maven. If you are using Eclipse as an IDE please follow the instructions on http://www.eclipse.org/efxclipse/install.html to add JavaFX Library. + +To Import this project: +git clone https://eng-git.canterbury.ac.nz/fwy13/SENG202.git +Open your preferred IDE and then Import Maven Project. \ No newline at end of file From d7ddf9984295854f5c996577a2eb7b3a3994ac70 Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Tue, 13 Sep 2016 16:16:24 +1200 Subject: [PATCH 2/3] Added Sample Loading for the GUI --- res/userdb.db | Bin 4305920 -> 4336640 bytes .../java/seng202/group9/Controller/App.java | 50 ++++++++++++++---- .../java/seng202/group9/GUI/MainMenuBar.java | 25 --------- .../seng202/group9/GUI/MenuController.java | 9 +++- 4 files changed, 49 insertions(+), 35 deletions(-) delete mode 100644 src/main/java/seng202/group9/GUI/MainMenuBar.java diff --git a/res/userdb.db b/res/userdb.db index 83d5a1b3abe545927c76ea1eb8c159e652c757ef..b84830c8d31aa01a0c03b0608f1c12300daf8be1 100644 GIT binary patch delta 4988 zcmb8yTWl2983*v$Gi!VC9q-znWsOo0S6l!O3I}? z0HxYPBTDV4C{#jaE)|OsS>DsR12sQsgkIYsZyv? zsnV#@sTNXYQ2Ar?If2wh--M@uu0Ad)mb@h}uO^Nvr#;Eef8611Pg8!$lb@!9WB=|C zoMlXj+^Wx9%K!4?tO0M_)$gvkG#I!vnE7Zh%QKk7{-{j4bLrQ3S6{;Pt-l6x`A6?% zmGX!;qc;9Q7oG9TnD0kfzxT{287|-3bG`JR-=6EB-~AhQC9PNN5UrQ(1+-qWCTRV- zPesyF7< zw3mKP$IoLgWT1M4C)kxJu)lAhw)k@Vy)lStx)k)R$t~a8Ob8o%x zcd-`_=$ha4-q(GF3zeOU`hhyGHmXVN6ZU;J%!)l56abu%NLk3H1OnGwhTmZxi`%aS5N4Tb+bU#nsdXZX!08BJ>U!)gBc+xlwHIX+jQRkDXu{7HdUqn16K#kMHU< zna=-vSFdG88ow~B>&!^y)n!^eGgA1?sPk(l^BZN(CnfRD+fIKXzdq-jX90iw1HB^} z@q4*9tgU561qRA7P=8vphildN08x&^G8CF>^1 zx)H2>VBO%bmPhL~y34+$*D+&Ej*QBY;}|)Hk)ufB2y_oa_YibPpnDLyZ$S3|boWDd zA9P=b?q28)JGv{Qx9Q7es-o9qqSy3@UQN%iJNz_T8o^??@2JedcYv~a( z0n;stC@|v)yxvIW~M6}y{~sLvk}b= zXkI3p>(N|?7|dF5)_^l2IhTU78k|*MhX+dJQwzptlFT ztI@j(z4VQD=~set1vr<3QwL`kI6J}F0nT=Cwt=%1oGsvN24|DY88vk8tGq(Z9XRa( zPTP;uZpUf2$&|JNehc6?OZZKI-zeex0KWn7y%PR4z^@1VItjnlg^$iAJ`V>=f+fzT zGFTieR&OhP!NOpn`*T6CK%G^(_>}F-O9%x+>U)aDlb?lxvG!-7oy!%I!ex!f%Q`6Uhc}S%0c5-%8Sg{J^xSbX-iwTfk?{~R-h+&HBja7j zcn}%ybTa77J+Cy?HlOm7tF9hd1H zLwZM%-VrCgUCc@qjTUV-+?|q@EE=sO(P$+iW@~})w0y$TN`R*o4^Jyjcv@cJX{o}~ zV#3p+XS3sJDe#G$KCW&X zbX%d@0^MflHbJ)$x((1>2Hkq-);YQ>qd!Z0&YxPoky!Vqp=%y5eRmJ?segtB_^&?p z`P2)+3%u#G(0+dJv(Qc+c^2|Tf9RuK#cjQrSzGZ5Tkr{+@d=yo2^*1LAEMZRD0*cS zw1sn{SdS>y$tcz$3fjYoD0&dZYDBS0M$wHZRyt9%MDNgx$vS}M{b=4Nn_oxsUgS0` zLl}}F>_G^-5yCEnFo+Q7@!*EA10f6`gnopu9U*LULJ)6nYXZGz(0dxar_ei&z)phm z1USdQISS6>;5-J-qu@LuIcd-4avlQbh~zv7PTI5)XViIn+q4gHnr)wGwiD27$BSm0 zHX^RQ?G>E1DmZNhPTM0mZ3Ub&l5<*eo&)C;I48k*7M%3(ly7f4Bzo;dqSp?JURx8r zHa#62dOJ&S+L?mW4hT-$FF5TC!D%lPoOZh4w9^Eqohmr(6v1gH3r;&paN3D3XY_me zfB3&X_N|F^|08t6<9-`>_ZOjle(wwCoA7BUMI8x_@L&HaG*p^G-=K+U(9@kf-PNC+)* zAp~QYkTK8+5uBjVjadmkMM!sTTC^|_glO3x5JS+WZ?pKox#yhAIcIwRsXqNHts~_SP z-IkB~NXrHeVsb=|((bI0`YSgkx|VPQXd1f>TfpHE Datasets = new ArrayList(); private Dataset currentDataset = null; + private Stage primaryStage = null; public static void main( String[] args ) { @@ -27,14 +37,12 @@ public class App extends Application */ @Override public void start(Stage primaryStage) { - BorderPane root = new BorderPane(); //root panel - Scene scene = new Scene(root,400,400); - //create the menu - MainMenuBar menuBar = new MainMenuBar(); - root.setTop(menuBar.getmenuBar()); - //TODO add the getting started page here. - - primaryStage.setScene(scene); + this.primaryStage = primaryStage; + try { + replaceSceneContent("menu.fxml");//replace this to check your fxml file + } catch (Exception e) { + e.printStackTrace(); + } primaryStage.show(); //testing out dataset try { @@ -62,6 +70,30 @@ public class App extends Application } } + /** + * Replace Scene Content with fxml file code from oracle. + * @param fxml + * @return + * @throws Exception + */ + private 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; + try { + page = (VBox) loader.load(menuIn); + Parent content = loader.load(getClass().getClassLoader().getResource(fxml)); + page.getChildren().add(content); + } finally { + in.close(); + } + Scene scene = new Scene(page, 800, 600); + primaryStage.setScene(scene); + primaryStage.sizeToScene(); + return (Initializable) loader.getController(); + } + public Dataset getCurrentDataset(){ return currentDataset; } diff --git a/src/main/java/seng202/group9/GUI/MainMenuBar.java b/src/main/java/seng202/group9/GUI/MainMenuBar.java deleted file mode 100644 index 489fdb7..0000000 --- a/src/main/java/seng202/group9/GUI/MainMenuBar.java +++ /dev/null @@ -1,25 +0,0 @@ -package seng202.group9.GUI; - -import javafx.fxml.FXMLLoader; -import javafx.scene.Parent; - -/** - * Main Menu Bar for the program - * @author YaFedImYaEatIm - * - */ -public class MainMenuBar{ - - final private String menuFXML = "menu.fxml"; - - public Parent getmenuBar(){ - try{ - Parent menuPane = FXMLLoader.load(getClass().getClassLoader().getResource(menuFXML)); - return menuPane; - }catch (Exception e){ - e.printStackTrace(); - } - return null; - } - -} diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java index 2d8037e..96c7d5a 100644 --- a/src/main/java/seng202/group9/GUI/MenuController.java +++ b/src/main/java/seng202/group9/GUI/MenuController.java @@ -5,10 +5,13 @@ import java.util.ResourceBundle; import javax.swing.JOptionPane; +import javafx.application.Application; import javafx.fxml.Initializable; public class MenuController implements Initializable{ - + + Application parent; + public void importAirports(){ JOptionPane.showMessageDialog(null, "This is not Implemented yet"); } @@ -29,5 +32,9 @@ public class MenuController implements Initializable{ // TODO Auto-generated method stub } + + public void setApp(Application parent){ + this.parent = parent; + } } From 6f14fc48f0f6dfcc1916cee73ef8d4f9fbd2c34a Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Tue, 13 Sep 2016 16:23:27 +1200 Subject: [PATCH 3/3] Added Raw Data loader for Airline --- res/userdb.db | Bin 4336640 -> 4338688 bytes .../java/seng202/group9/Controller/App.java | 4 +++- .../seng202/group9/GUI/MenuController.java | 18 +++++++++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index b84830c8d31aa01a0c03b0608f1c12300daf8be1..478b2fe9b448203519c712b01f2da19452338f5d 100644 GIT binary patch delta 877 zcmW;JNoZ3+7zgk-Gimd*sfle&U;1L3q^(`jYPzV^n&mx>YwhB`1hFR%qA1=<-B4-8 ziWa4xC`Jn^;z=1WH3+tPQ1sAR5CS6hpwdIpXf6d&{KtXc3^UBk_kA;G(gXa=%mBZt z=N(cM$K@e!gdKWvu(Ozbl#h#ltM*=ZFV_34f^)a#*3P9o{V5Lv4gxHY2l-$H73RTw zC;%H2!UC{^0~SIN6oV5MB~u>P=3DAXW>a!mP_)Z>>e{Tcj2@1<_F4EW|CY>u=K93! z`6E5pFep3GUy`BzUnv)qfCg?T1sy!F7|Ng=yx;>rR6r$E!4jy38mNUj2tYkFz*1NS zL1=^~XoeP84l7_Kw8AP_4Q;Rna`}ZJ0@38Jlwofq<~6bUHntF;=&trWRov~k%^S4NBgms@DO%#5*He$n=@->9M&m)PhRbzy%CF&;wPXwzH;Q^`(htAZz@uhb-pOsD8h0NbzdwAi#2jLeZFmkxZFi$2_wkmPU=eJs@XyB gJ?2`royHTnBDc}sgwe!hH=Vs}7+iMI(ps(gA3w-ZF#rGn delta 528 zcmWmAF-RL>6bJC{yIjm?5__qMG1u?ZL``eesIh8WHO=KfN*%P&t#!~P)Io487$o3e zz(vXM&~`|c;-H{pIC~&;caavM(CVf*1T3jr5&UQPz2WhH@aN^P3rhZ1LD`h3G~2I=!HJ$hXf43APhkghT$2Ez$lEt zb9ezSVH_r45>im_msoSYD`9Tr* zgV5u8+%DZ@79zyI*RO;Xqq{3<+Nn!f9`_Z+p6EX3lgtpqQ&&5 vd~vDNOT%Ayg3JrAO1D468+$5dop4(IDH62*PrjqSJ}W?{S91Pqw