From 20055e23ea32139a941e94d71a2e938e5ecd6795 Mon Sep 17 00:00:00 2001
From: Eilert Tunheim <emtunhei@stud.ntnu.no>
Date: Wed, 30 Mar 2022 14:21:53 +0200
Subject: [PATCH] Updated GUI to display popup window at the launch of the
 application

---
 .../com/application/GUI/InputPopUpWindow.java |   2 +-
 src/main/java/com/application/Main.java       |   3 +++
 .../com.application/CSS/styleSheet.css        |  16 +++++++++++++++-
 .../application/GUI/InputPopUpWindow.class    | Bin 4282 -> 4291 bytes
 .../com/application/Main$1WorkerThread.class  | Bin 2263 -> 2263 bytes
 target/classes/com/application/Main.class     | Bin 7135 -> 7142 bytes
 6 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/application/GUI/InputPopUpWindow.java b/src/main/java/com/application/GUI/InputPopUpWindow.java
index 71bfe58..7e2f1b4 100644
--- a/src/main/java/com/application/GUI/InputPopUpWindow.java
+++ b/src/main/java/com/application/GUI/InputPopUpWindow.java
@@ -91,7 +91,7 @@ public class InputPopUpWindow {
                 sawsetInputLabel, sawsetInputText, moistureGoalInputLabel, moistureGoalInputText, startButton);
         layout.setAlignment(Pos.CENTER);
 
-        Scene scene = new Scene(layout, 600, 600);
+        Scene scene = new Scene(layout, 600, 500);
         scene.getStylesheets().add(InputPopUpWindow.class.getResource("/com.application/CSS/styleSheet.css").toExternalForm());
         window.setScene(scene);
         window.showAndWait();
diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java
index d6d7bbc..54c95fd 100644
--- a/src/main/java/com/application/Main.java
+++ b/src/main/java/com/application/Main.java
@@ -111,6 +111,9 @@ public class Main extends Application {
         primaryStage.setMinWidth(1200);
         primaryStage.setScene(scene);
         primaryStage.show();
+
+        // Displays the input parameters popup window
+        InputPopUpWindow.display();
     }
 
     /**
diff --git a/target/classes/com.application/CSS/styleSheet.css b/target/classes/com.application/CSS/styleSheet.css
index 54b83c3..76111b5 100644
--- a/target/classes/com.application/CSS/styleSheet.css
+++ b/target/classes/com.application/CSS/styleSheet.css
@@ -17,6 +17,10 @@
     -fx-alignment: center;
 }
 
+
+/*
+    Sidebar styling
+ */
 #sideBar {
     -fx-pref-width: 250;
 }
@@ -39,11 +43,21 @@
     -fx-font-family: Arial;
 }
 
-#sideBarButtonFinish {
+#sideBarButtonInputParameters {
     -fx-translate-x: 5;
     -fx-translate-y: 20;
     -fx-pref-width: infinity;
     -fx-pref-height: 25;
+    -fx-font-size: 16;
+    -fx-font-weight: 200;
+    -fx-font-family: Arial;
+}
+
+#sideBarButtonFinish {
+    -fx-translate-x: 5;
+    -fx-translate-y: 50;
+    -fx-pref-width: infinity;
+    -fx-pref-height: 25;
     -fx-font-size: 20;
     -fx-font-family: Arial;
     -fx-background-color: rgba(104, 229, 59, 1);
diff --git a/target/classes/com/application/GUI/InputPopUpWindow.class b/target/classes/com/application/GUI/InputPopUpWindow.class
index 6d5867cd2617d66b840aed7ac25dce4b744bcf28..98332e735b1b7bbf70ce791e6114ac983ba0c3dd 100644
GIT binary patch
delta 1134
zcmdm`cv!Li)W2Q(7#J8#7@l%5I5DKLGo*7dFfpWYGGs7hf>>D`4A~$$hn*ppgCUQL
zfrBBRgP{OK7jiHZaWMF@GZb?%@H3=wFqDAkLJo#f5M2f$$~hP+I2bB97^*lJsyP^H
zI2dX<80t6}>e(3@I2ana80zIf#x-#<$T1WOF)%Q6fLNXE3|(vvDhy!2#h}X24I+Bj
z8G5-H`WX5-8744H1c^*yXPC_9&~yN-j?JOo0nFfH&|{baBBru4Oygjf&c!f;VI~*D
zEQZ-2-E%;mnF}K3aWc$jkX-;G7lMdIAYw6ySOSt>%FeKCvk;>xvx75(3nPP2R$^IV
zT7`abNn(1celUn+XIRd|u!3PF55p>k)r<@Ro_PhOB?<wFMTxnoC8<TlJPd0X)-p0k
zO%7ldoqV2=RhE%~6|9Db!5JjMkqOcel3&2Xu#REv<b5nY9P1g@@-S>**f?2;wO?YB
z0K;Z}Hij(%3|n~^wlQqyVc5a2laWDU60<}o$cSA$47(ZjFfs_joR*xLm#XiVpOVVX
zu$PBnAH#ljh66kd2N@3WFdSw$g5(FV!e9^yGUq4{!!eLKDwCraRVI6}Y1kd-VK~8X
zlAYlc55sAOjXVrz7|!xAoMSl8!*GGYg`MFd55pyf%RCHMK*UuLaScRV2N5?ITqbW|
zd#rSm;T9u<xP}kZZK-9cc_sR;AktbhjEljP;r8aO?D5RpcX$}?GCbsANMJ~uEYEGq
z_;_+C_e;hnlkItYgiRToz%k0qz{udt;KIPj;5vC8kC?g}0|Nsa10w?igAju|0|NsO
zn9a)I!Qjcjz`)7i1yQ^CHqQh`9mDMm##VfieA^gIgiM9ZwlSD*W3brCV9CS~t_2dc
z(%Qygy^(=|fr-Iw@^rrS^&k^xFz_>QFfL;7X7FKPV323*X7FY3V_;;^XRK!MXYgZS
zVz6b*We8vhWMF29WDH~oV(?>NVaQ~3WC&&mWME}zV$@&=Ven&MW0=G!!4S$2$iU99
zn&Ce~7=s@J2g7cL_YC0-fef4sR~W7_L@@X<a4|e#IK~jk5Xiut%<z|CEkhJTGy@N#
z5<>?=3_~mfFJl*j0z(`_JOiHq7bvJeLBYVlFqeUmfsKKIK~rlRgXm@k8wh2q4d&VD
zfGK-jFy$c0vW>wJ=1&a)<$RDo?I7C0J^=-_CfKc@kktgckO^cs*j>zE7AQPez^o*O
sWCm6SW`-1S$fYtoU|?Y2Vqj#r$MA^ZK7%AfGc;aW7?>Ga8QK`y0Wogw#sB~S

delta 1087
zcmX@CxJ$AA)W2Q(7#J8#7#?#mI54EJGo*4cFfpWXGNdu2gIF0H44EK0i=82xgCU2D
zfrBBJgCP$@=W{R=a4>kYGZb<$@H3=vFcg94d=7?U5M2TyN;w$HI2g(~7%DgzDmfUc
zI2fuq7-~2eYS|g;I2h`=80zIf#x-y;$T8##F)%Q+fmrSA3>|C^Dhy!2#h}X22_m}K
z8M?U{dKh{+8TuIdK_U~_878thG#!Ad(_@&##h}M9nVn$@2g6h@hG`7bxfo_J%mitg
z1@gme5HW|7VJ^cw5HX*VVXg?n0uXZ{h*$)YUd+z0WV1A*DYJtkgA*fzP*!4DVp@fM
zaY<r&s(vttWM^2)!?28DIS<1MhLwyA0-kvVr6mdhiA9OIsU@jJ#XJnF7*;bfNKF=G
z5}mx1g<sea#O25YDGSLj;9*$9uzK=w79Wna46At<)-kM~EX~?4x<P<pBR?C%CIN=c
zJPcbHw(>A+W7s}<KdY>vBf}0JhMf$%7#Rd%j!90<OV#(wPf2BG*v-SRhhZ-}!#*B{
z{R{_q7!EQVn#{{4&f&;#n1|sA!>-9XZ2opfc^Hl{9A{@Z!NYKpVLcDSDTdQL3}+b5
z@-UoZaAIdT&%<zm;UW*iB@l5LL|g$8S3$%z2B*n8*&Z`rXSgwWKD!LFF~iNx``F`|
zxo`0>+-A7X!w|<1KUss@l=0!@IPRA$j~E$LCtu_ipPa;F6kyEY0FD}F21W))1}6qa
z24@Ba27Lxb21W)323D=@42&BY7#NrsTo@P_*ua8946Y0e3_M^qD}x(@I|Bm)CxZt>
z^X4Z!6Bu>$w=)=8@k#P+V=xjj7Bbn!V7iULY$t;`6GONbNYp}W8-pd(+{p|0*4Kkf
zoWa1)z`?kP!IQy@fq_Auv75o0!H0p7L7%aj!I!~@fr-JEF_*!Q!JmPdA(AnWA%MY$
zfrTNH(UBpL!JmPZp@~t0A&9|;fsJ7jqXa`RgFgd1!)k{A3?U3Y3>*x*8QwF5GWaua
zGF)M}#t_Ef!@$Mxgy9%NID<a}cQV6YhP4b443P{xj7kh03{ecx47`k83<?Y}46zJ+
z0$iXVgoe#r21W)p1_lOAt!)gVn;EPil(jaPXQKnAY<0nuog~XP278!44F#0*LH@LZ
zXb1ZQ6!w~6w}OIO6YN4Jkl|o=F@ss4@L&P65*QL0SQ(fZlE5*N%y5r^fq{#Gk>L)*
X1BSZ{k_?T|cxhr_W@u(;VQ2*ar3l^g

diff --git a/target/classes/com/application/Main$1WorkerThread.class b/target/classes/com/application/Main$1WorkerThread.class
index 9abb12eca1a252de3954b0675b49e8a0237e772b..cdef169a0661776404a1cbb470ab1ca6757528dc 100644
GIT binary patch
delta 89
zcmcaEcwKOVAv^D322O^9415en7=#&)PPSuTX?lu*jo~Z<C&Ot5E`~D<d<+*DL>R6x
vh%;PdkYKpPAj5E(L66}ogE_->21kY)3|<U38GIS;OqSuuV!S%Jog)AMIiMI|

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

diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class
index 39fa3937ebc8e1f685f160bf072975ffcae6a97d..71eeb5ead13fb84c7ab9e631dbf0ef1482c293cc 100644
GIT binary patch
delta 1335
zcmca_{>*#>A7eci!*_-s><m9S7=Cdv*f9L&VEDtq@Ry5$m*F2f!+#D&1}+9ChTj~F
zj3D|ZJ0lYpgFC|s5OI@(k(rCZosk7ZuyQc6aWJxTFmiA(a&j<oaWHbTGxBgS@^Uc*
zgS7L3=$k?e42&XN48e?|9E@TdjN<H!^%7hRF(C6|7$vzFVi={^8Kt=x5*TGbge(^W
z7o!|E!&^pqc18tuMnw)rB`$_EhTmKasf@}Tj4JGms$2}&jB0ESkqlq};;DlO4R%IN
zE`~yo$?S|;Tny|Cci0)V*%@^h8F<3;i?UOTLNba{6H_+xFr8=TW@n7#VT@vEVPue;
z#40)YJEsg=G@}zEgVZEe(aCyT!E7;%COnL>liRsgh{g#p#`Ci=CI~Pb=3z`^OyXfo
zW=xsv!tKkQ%9zH(m<}>UX>tIw$m9*&LIN2)43ijIco;Joop>0t7_%o|;x1*(ne4%n
z%$Li<n8z5x!<f$)#K<5uxshFpm4~r_(SGv-p4H5gO@;I~cM7ax+?*nGjEQp>13Lp7
z0|Ud8$;P4&1a>f3Z)9L#U}k7zU|`5&ke;j{mL6Kd@R*^Lp`C$&!49I7p@X3l94Jp1
zrZ7xpU}WH6xWh1wp^AZtL4#or!*qrj49pD442=vk8R{5V7?v^EG0b9^&A`eqhk=2C
zhk+5KYVr*+19O{5A=~W?cD}nAY$Ap1w=>xJfmsgQ8SJcBw6`%h>g;4NW?~2jF?A8l
z$@b!svJDIz49yHe3@r>Y46O|644n){3|$Pi4BZT#41JSJ#iQz-B88l{Gr0Kb2)S-!
zaNEt`9=V;t!%r8)^VAjc+Q#6myN$sod^dwrq>%4+1{W(9NfwYKOsN&CBrAyTDak72
zw~fIYtk55%kWG>eBmq~*F3Aq!drGnk1;7*r)`L`XNOFK=;3_#KIYE3+Nlu|4u*%>_
zp^)tip;layTtZ>n7{VpFb}>XSFl=Lp+|3XiDHH{g<Cf$Wir&T$zMCN?ayvt;6^|s3
zK*~0TI7yyu4Dq`e5+b!EdA2hoZevK&-o}tDz`d72F_Kww@>vPX`V>&;ZDLT{!Jw|a
zfq{X62^_Os3`z_P4AU4m7-ldCG0bF;V3@_Az%ZLZjbRRh4#QjqLx%YbHVg|GoEa7}
z_%JMD2xeH!5XG>RA(denLk`1ohEj$V3^fcZ8JZbZGxRa6VVKIWmSG;lI)<eT>lxNC
zY-HHZu!&(G!)AsPN(@^WE;DRnxW%xW;W5J=hF1)G8QwG8XZXYLn9-Ht8KV!wi^<C+
z7uBam?q*1f6iVODkg=U1(`PpWR3Hl?;Jce4J5qZ)LyjMap|hPK$BIQ)gdukuL%uG{
zHiiO876?a@1;pFUP#C$Lp$HUxV4oMm1lT0mU;^xs?BGz+4US}yWSx9Mir1-R13Y}p
z7<d^N7``(IGW=jrV))IV&G3i8l;J;v4I=}CBO@b&CnFPsKO-wc1S1<m0wV`QCL<?9
zAtU!>ap?jfa0Y?|GaCaV0|Ue6$up%@6%!a37|IzK7|R$d8Os?Y8Tlbufl+{gnNg5Y
Hh*1~-8Br>I

delta 1321
zcmaE6e&2ipA7ec`!*>pbA6yL93_m#-esM7T=3?Mw_`}ZdmxJLS7lR{6^goEc$<D~Y
z#o)$p0z};8U}WTCaARZw5zHKnEF6ri9E@xnjO-kY92|_C?2KF-jNDudK@2}R7<oYS
zO(6ybMj<YSAVy&hMiCB1QFcZ#E{14^`V(9X(Tw6CLV}%9l8YgpQ3^yzb1`r+%5XEh
zWt3%Slw)U<=U`OeVn}89$;FVusK~*n#LlS9#gN6Q!sZak00tnQDu_^HXH@56C;+*X
zol%2}ft}$F7o#Sl7CWOhJEIOG15bE<QFdxkNJdd=V#;P7rt|ERA9GqTMoyOD%4LgU
zG~r>4p4`v1LNrEzF_xc=F;0NtFb`uqV*(FjB4g5IA8uc^WX2R8#?;C4xwQq-co-%z
zwD2&dGdl4wW-w+>zQtY2m^C?oCz&&whcSmSgoiPA@*W;V?mR|&cE)@j#sY?x%@251
zGjHA_u!519kwInh0zr|<3k0M#rwAQm;@r%@&cMdN!0>RgvFHQdjSLJ7%nWS|3=CNe
zQj?X%(gTYa+8G!a>>z3wIv6^^et*a?g<&cKBLfG+O@?U<RSZlF8VoxbrZdc7U}i{W
zsAHJPP{+W+u#CZ)VHU$|23CeS3=9lB42&RElkbZe)LTai*=%R9_1(>29VukDox#=*
z%(CCkU~9#qy^X;^XD5R(6GJ$Nsf%DrvOw7z7#J9s!0uFH;9y{2sAb?_XkZXxXk?IK
zXkt)jXk##9XlJlx=wR?<=mz`1gn^ZTfx#Q%gUNm39`%lqLQdNmoPBkKT(&W|?q+a{
z+|J<crwihF=n8pmWAM`5#^4>ko53+s$Y(o)vlWXZ3rG^C)QVM-6~y<DWEJw=#^423
z=m%2BCdmepfGcE|WC!s*B-w@hVG0B4K`J>UIY2USm7J2CAijqrr%)hRWl*G0@OFj}
zD=tYcq0ns%VUk?C7{VDCwlPHPW(bNDiUi4VOL7ZEZDR=A%@7^Aogv1GN0LV%WgA1R
zB+oX6xZMo#ky?^G+ZhtJF(hhlV@ML<-pimE$t*efii9O&@?<_q>H5hG91K$#gcznV
zNH9!iP+*wBpvEwhL5E=$gCWBl1{;RC49*Pm7<?G!GXyg%V2EN^#E{Ccm?4K@2}3Ev
zQid9aWem*>D;WA1Rx(UwSj8}pVKu{2hBXXp7}hatXIRg$k6{DD35HD!ml-xQ++x_l
z@R(sI!z+ee4DT84F#KV7!05`x@R-qu;pyacl8fq7B6l;SMhc~EXGq`9km0kN0V<FQ
z5%As3kQJ%Dogv!~#L(H!kZr}HE5eYojUi8$WgA1jBnyNi$pYf-W+;f<&QJ)7s7(xN
zI~a;!0&J3OFah>Rc5ry;21l|;vQ9oP#p_gzNL^+OybKHsUl;@#zA`8={9w>#_{m_(
z@Q1;M;V*+D!#@U3hW`xyj7$s>jLZxPjI0cqjBE^rj2x5Yqzi;fK$!`WNZA+|85kHg
pOkN<Zsu<6}z);S>z*xpu$ym-H$q2H5hk=oikAazypHYBO5CCbyDP{lw

-- 
GitLab