From c2e4f346d524ce0593a056a51e449d7d5a630f67 Mon Sep 17 00:00:00 2001 From: Eilert Tunheim <emtunhei@stud.ntnu.no> Date: Fri, 25 Mar 2022 15:21:56 +0100 Subject: [PATCH] Started working on the input popup window --- .../java/com/application/DB/Constants.java | 10 ++-- src/main/java/com/application/DB/DB.java | 4 +- src/main/java/com/application/GUI/Input.java | 52 ++++++++++++++++++ src/main/java/com/application/Main.java | 7 ++- .../com/application/DB/Constants.class | Bin 1635 -> 1634 bytes target/classes/com/application/DB/DB.class | Bin 10382 -> 10271 bytes .../com/application/Main$1WorkerThread.class | Bin 2263 -> 2263 bytes target/classes/com/application/Main.class | Bin 8168 -> 8974 bytes 8 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/application/GUI/Input.java diff --git a/src/main/java/com/application/DB/Constants.java b/src/main/java/com/application/DB/Constants.java index f579213..4c7abb9 100644 --- a/src/main/java/com/application/DB/Constants.java +++ b/src/main/java/com/application/DB/Constants.java @@ -29,6 +29,7 @@ public final class Constants { public static final String PROJECT_ID = "sf-drying-optimization"; + /* // Location Valasen(124) // Project settings public static final int LOCATION_ID = 124; @@ -50,10 +51,12 @@ public final class Constants { public static final int VALUE_ID = 51; public static final int LIMIT = 1000; + */ + + -/* // Location Arjang(174) // Project settings public static final int LOCATION_ID = 174; @@ -66,7 +69,8 @@ public final class Constants { public static final String START_DRYING_NAME = "DryingStarted"; public static final String STOP_DRYING_NAME = "DryingCompleted"; public static final String KILIN_NAME = "KilinId"; - public static int KILIN_ID = 17; + //public static int KILIN_ID = 18; + public static int KILIN_ID = 18133; // Swappconsensordata public static final String KWH_NAME = "RealValue"; @@ -75,8 +79,6 @@ public final class Constants { public static final int VALUE_ID = 19; public static final int LIMIT = 1000; - */ - diff --git a/src/main/java/com/application/DB/DB.java b/src/main/java/com/application/DB/DB.java index 7a59c47..0392a00 100644 --- a/src/main/java/com/application/DB/DB.java +++ b/src/main/java/com/application/DB/DB.java @@ -6,10 +6,7 @@ import com.google.cloud.bigquery.*; import java.io.File; import java.io.FileInputStream; -import java.sql.Timestamp; import java.text.SimpleDateFormat; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.*; @@ -279,6 +276,7 @@ public class DB { extraInputParameter += "AND CalculatedStart BETWEEN \"1990-01-01 00:00:00\" AND \"" + TODAYS_DATE + "\" "; } if(LOCATION_ID == 174){ + // KILIN_ID starts at 0 not 1 in the database. KILIN_ID -= 1; } diff --git a/src/main/java/com/application/GUI/Input.java b/src/main/java/com/application/GUI/Input.java new file mode 100644 index 0000000..5f948f1 --- /dev/null +++ b/src/main/java/com/application/GUI/Input.java @@ -0,0 +1,52 @@ +package com.application.GUI; + +import javafx.geometry.Pos; +import javafx.scene.*; +import javafx.scene.control.*; +import javafx.scene.layout.*; +import javafx.stage.*; + + +/** + * This class handles the popup input window + */ +public class Input { + + public static void display() + { + Stage popupwindow=new Stage(); + + popupwindow.initModality(Modality.APPLICATION_MODAL); + popupwindow.setTitle("Input Parameters"); + + + Label inputLabel= new Label("Input"); + inputLabel.setAlignment(Pos.TOP_CENTER); + + + Button close= new Button("Close this pop up window"); + close.setAlignment(Pos.BOTTOM_CENTER); + + close.setOnAction(e -> popupwindow.close()); + + + + BorderPane layout= new BorderPane(); + //layout.set(inputLabel); + //layout.setCenter(); + //layout.setBottom(close); + + + + layout.getChildren().addAll(inputLabel, close); + + + Scene scene1= new Scene(layout, 300, 250); + + popupwindow.setScene(scene1); + + popupwindow.showAndWait(); + + } + +} diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java index 38ca17b..73d3dfc 100644 --- a/src/main/java/com/application/Main.java +++ b/src/main/java/com/application/Main.java @@ -1,9 +1,9 @@ package com.application; import com.application.DB.DB; - +import com.application.GUI.Input; import com.application.GUI.RingProgressIndicator; -import com.sun.corba.se.spi.orbutil.threadpool.Work; + import javafx.application.Application; import javafx.application.Platform; import javafx.scene.chart.LineChart; @@ -133,6 +133,7 @@ public class Main extends Application { Menu menuEdit = new Menu("Edit"); Menu menuHelp = new Menu("Help"); + // Adding the menus to the menubar menuBar.getMenus().add(menuFile); menuBar.getMenus().add(menuEdit); @@ -155,6 +156,7 @@ public class Main extends Application { TextField treeSpeciesText = new TextField(); treeSpeciesText.setId("sideBarLabelText"); treeSpeciesText.setPromptText("Bjørk"); + treeSpeciesText.getText(); Label dimensionsLabel = new Label("Width x Height"); dimensionsLabel.setId("sideBarLabelText"); @@ -176,6 +178,7 @@ public class Main extends Application { Button finish = new Button("Finish"); finish.setId("sideBarButtonFinish"); + finish.setOnAction(e -> Input.display()); // Creating the circular progressbar RingProgressIndicator ringProgressIndicator = new RingProgressIndicator(); diff --git a/target/classes/com/application/DB/Constants.class b/target/classes/com/application/DB/Constants.class index ee6bb5b8f6913b4ea14d678801b18091462f88b2..fb8b19188b18e5a1db449153c03e34c3e6da09c9 100644 GIT binary patch delta 161 zcmaFN^N44I2qWXV$)b!`8HG2$X4GOdkj>01iBHLnFH6kHO)SYwE>0<`%*;zqN-Rmv zNG)b$kOavWr^FYRCl(YW=jTm!WmZ<?cL6JM&d)8#Ni9iDVPs(U&dkZo^Gso6;0#Jl z%-P(-Jef(snt_P{1f+$Sb}%q+W?<RGz_NpZbsGcQW(Iaax2uzF*`&EW85kL?85kIt G7;FIZelC6h delta 162 zcmaFF^O$FY2qR<7WKqVejK-T^Gios!C}if9#HVD(mnG)pCYEF-7pD|eX6B_QC6**- zq!!1Q88I@5fs_=d#FuC0B_~gIWmZ<<b56`jF3m|SNlghZ$uD4J;PB4O$@5FhO=V=@ z2}>->Ow23U+{rwdNzRgii2(#8g_w3QFmGmH*~GxIgMoD$1KVZ>c8<w5Y|`9142%rc K3=9lR3^o7{^)4X* diff --git a/target/classes/com/application/DB/DB.class b/target/classes/com/application/DB/DB.class index 6b2a20d0bbb3a84153fc114c22d49e9754330191..b64f31c04a61860d9b2e4ac3a60b4f114f3d1935 100644 GIT binary patch delta 3308 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 delta 3402 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 E02wLSZ2$lO diff --git a/target/classes/com/application/Main$1WorkerThread.class b/target/classes/com/application/Main$1WorkerThread.class index fc1cb79295b938a5ba6bc65d216611f6e1d0be64..9abb12eca1a252de3954b0675b49e8a0237e772b 100644 GIT binary patch delta 89 zcmcaEcwKOVAv^B@22O^3415d+8H5=QO}1lSX?mQ2jo}mnC&LK_E{2l~d<<t9L>MkI vh%=mHkYG5^Aj5EhL66}QgE_+$21kag3|<V^7<?ISPL|=wV!SlDog)AMFZ&oL delta 89 zcmcaEcwKOVAv^D022O_E415gx7=#)2Pqt%UX?lc#jo~;0C&N(&E{0<ad<>@;L>SI7 vh%=mKkYG5&Aj5E$L66})gE_-R21kZV3|<VE8GIS8O_t%vVmv>&og)AMCRP{j diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class index 23a916a35e825fce2f8a9fed85331c992bbed12d..0d5b4b05146df4bdf444faab24858fda26ff690c 100644 GIT binary patch delta 3884 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 delta 3055 zcmeBkdtqOH>ff$?3=9k=j0d?Gx)^?PF?2Hg0<nIxGyLIVU}5;l$<WF0m!07s7Xv$l z^PioOfs26)%wc3?XJq1H;DvCQxfnVbSwI9Uh+qQ|>>La$xENR%IXD>lxfs|%^kgmu zUJyNzi-D^i#8}D2P{hc=&dABdz{SV~Qq2t_ct8X%CnFytKS)A=ol%g@VbTEx5MXm? zf-txkR2hXpgfJJQ2%{(mqZk*XIHLp?qa>pgH={J83<sku7o!}bJcv*L5sDx}2}CG! zG1kj5s<1PvaxkiKF<3CFb1-UfFlvI_r^U{w&B3U{#b5^#)dkTU?2LL`49=iHa%SY< zVASVgaAq{%U^L`lG~!@1=3q48U^L}mG-GEp=U}wpV(<g$v;@%{?2J}i48b6s!Hm{i z48e>x?2NWt4B?FRb|BIo<Ua?Ha~;_ko!A+jIT&5I7-AXKxfo&?T{#%t*csiq7?K!0 z*c>83zGq+n@jO9<7dxXj7efZfXm&;)PzZCeGx~Bd<S_hXXY}J@$Yc1)!RXJ$ki!_j z&KL*^=pYWpU=S_O#TddE9?H#7%NWMZ7|s~M%^1lT1tOx^8DqE^su^S18ROU)6Sx@a z7=D66H<5!eiHk9rF@=jUl`)Nrp^h<~oiPK%$>L&YWy}Vdn$FIc!_JtyIh`qokvor( zfh999vxJ>7fAc-&bIgndo7b{`WE9I`XY^%f^kZiX1lv%^&KSeam@s(@XSgO;aDHh~ za;jTqPAVe<r*C3ro?cdBSt1X^REB9hj71D{c^DQkOk-q_oBV)Hgx@K@C?&NhATckM zhoP6DZ}LViS>}F*36n2!$udu5m^Aq#m!iyMhABJ@8yGh7Fl=Mk&ckq=;RFxEWriy} zjKz#4ll8d8+@>;?@-UV$mh&)HfQU-Qa(2cl9>!|M8Xm@4#yUm@A&?8wD)ft!Q}a^w zgFz$@!&Jt49>xa7Ms~&~9>!+ImdRb*8e*+HjBSkV?2H{ejGc^K?2O$!j6ICKlTUEV zEA{a(_A{37Fiv2c$ip~^aWW6%6c90$aT*WfbdZlEC-X8($}=*sfcy?Jzl4#2#Wf`p zM0up<6!0+4U~HW1$dk=Hld)v-7M^-W&B+VcG<kU#XEDy^VVnapLuqn?h{)uXyaGZ~ z8RzmaECGetJjO;I#`%m3CZFalW}eEpaIzy`BJWhjMLdj)K@M2LIC1iNK6&P)jCGSQ z@_92aV=S30&##y{m2o*EgMdp>WoBNwLO@Y|a%ypLYB4+G3LeIljH`GUS2M0*XI#s} zxQ=l>J7Xaa;|9i!JdB$dH#0H_gMv%Hv?Mb}-#4*9#Wk;_sFH_q3rLC=MT(tqD<gyA z<U$TbIUdGsj9rWjjJE8I+j$swFz#e$+{MGVn{f{h<6g$b$rt&=Cja9X<=)4*9~3eN z7#T!BKHY33P|Up9ScHwao<WhJlc9@&fq{jA36vBV7#Nrs`WYsG>4^-J!1QE>DGUq@ z91M)0)WpEZFr9&cL7#z<fsuiMfmLfe1LH=pvKb5v3~XRQC5D*{3=BMAHY>v{hS>}Z z44e#e80IoCfi)Y$G}~+KU|>S%=3-!CU|=v{U|}#sF<~CVd<F)F1z=|~GAv|Z1SMvW zS(95Nofv0KJ}xP*im=fTY9mbjVg^QrB@9c!>ba%fGtQX&TPnXEq~4B!je&vT9#lPu zwTxjo10w?m!!?E#41Ekt45|z}8CEi^Vqj)SV5nnQ%`l09g<&y+HNzT)wG6Bb>!7}b zs9Mj!40q#V1}0GEfd<x224)6U1_lQ2-3+{u+Zp(Lb~8+VDecBMW3qvaWNasc5knV) zEkiehCqp0D-zE^%P<L@KI5U8vfRRCn!IEJU!)6911{nr@hAj-68JHQ=8B`dyGHeD% z;5LTs5F43{8CV&37#JAUCohxHVcX4M7b)a1`L2vSm*+MHcQDs$GMlVCmp6>-Gg)6& z-o_Wq^@|kp-_8(V#U;rl6u6BcXg5P}<aUM-D{e_{fs}0wp_1I&7{Yclghy&ga&Kpd z*v1g4y^SGi@)TL?`e-JGaP3VD$~zcTv^T(0MHPb_0|Ub}1`dXq3_=XE7$g{GGbk|3 zVNhe3%b>$BpTV4A0fQaGLI!t+MGSrniy1;0mNFzTEMrJ#Sk6$uu!5nSVI?^9I~mq6 zOkh~cFq2^&!vco&49gidGHhbl#ITcLE5jj%Z44*t8MZT=W4Ot1o8c~_9K(G^RfdP) z0Ih-q1}s1s<r#J`Ok!YU5MmT%*vYVqfr&wZk)2^T!yX1^26KiF40{=NF|aVWGdy6} z$FPTil_7!QIKzI1T?}jt1q|C64lwLtU}xxLn8$FCVHem_eGG>f_AqcV)Nf)aWjM@m zgn^6U5JM`%QHEm-+zd>h!V{GG7#JAU7}yxt85kHQ>}H6G+|3XhDHOMzA$~hUf)89E z5hCEbn;|Judpkq2ABdr|ogvwZMOTC&WgA19F3UECbV(KnN0J4^+s%*>xt$?X+KN?@ z6&(CoP!TIONj8YU<a~MA`fNm`m@)7&Ffe>z5M=nspv3TnL7U+#gDJxg1{;Q-42}%H z7(5w%Gx#(7V~Ak*&yc{#$dJj%#8Ak{0uE0Ph$o=oDacUIaFXE^10#bHLmtCvhEoho z4B8B-3}+b5GB7ikGDI_+V>rve!VtkwZ^3Y$;Q|9ILnebd!$pP*3~cZmbBTcoRKGAV zgGvY{2L@IKeg+1Hi@O<eBDXW-`s`-Ni`>qT@2f3Tu#KT`H$zdRw$65jVn1D>l5Gs7 zI~dBWSR`3?GL$ni>}055WB`T3PKHWGhM5fglB_!!su&p#FjQOBvq`e;WT*jgYOUCJ zGt@<HXQ;R0kYq>F$tlSR)#(mmRWUMvGQu{722lDJYTU-qWW^)N!)#>5E6KxRw1c79 zj8Bqd8$-)(hSo?)UQxas3~k#P+IKP-FfoKL|G!mt8$*XA2b5d?KUWtN11t=n!qSgH zn1O+ji-CiYn?Zn)he3>yk3oS^fI*E>h(ViCl);}-j3Js)f+2-blA)DRnxThLhG8nB zEW>O@Iff;S$_#rMRTvI1sxq8mRA)HPs0)sn76x919tJ~(s|?o|xEZE0XfRx7n9sn& zFq=V%;RZwfH3nXWB@B`bHyLg*@G-P9STNjXxWmB35Y14?aF^j813N<sLk7crhKCFs z4E_wY438L|fXm2>(5U8MILYvo;TZ!Xg8;)phUW|~Kv{=jBeaavW?07XlHnc$3%F!d zU|@!t@rr?sK>?(yo&i)yLX^E`U}1Q}z`zj6!1ABLl7Wq#;VnDEJ9dWm><k~+89uTz zd}3hu&tSp8g(<<#@ENS)3s})F2H*b-d<?8;>X2%T#SCA;Wzjby1}28@VCD~o9tH*m nB?cCTa0Uj3ZUzR1I>va02Mm%7)eN-^kJ&gGS{dURGZ`cSW5kJ) -- GitLab