From 71da83b5330e6616333c7eeeee1ddf67d4310cdb Mon Sep 17 00:00:00 2001
From: Eilert Tunheim <emtunhei@stud.ntnu.no>
Date: Fri, 1 Apr 2022 17:49:11 +0200
Subject: [PATCH] Added output window and updated the main window with the
 input parameters given

---
 src/main/java/com/application/DB/DB.java      |  32 ++++++-----
 .../com/application/GUI/InputPopUpWindow.java |  32 +++++------
 .../application/GUI/OutputPopUpWindow.java    |  53 ++++++++++++++++++
 src/main/java/com/application/Main.java       |  51 +++++++++++++----
 .../com.application/CSS/styleSheet.css        |   1 +
 .../com.application/CSS/styleSheet.css        |   3 +-
 .../com/application/DB/Constants.class        | Bin 1725 -> 1674 bytes
 target/classes/com/application/DB/DB.class    | Bin 13089 -> 12956 bytes
 .../application/GUI/InputPopUpWindow.class    | Bin 5798 -> 5776 bytes
 .../GUI/LineChartFunctionality.class          | Bin 4589 -> 4505 bytes
 .../application/GUI/OutputPopUpWindow.class   | Bin 0 -> 2459 bytes
 11 files changed, 132 insertions(+), 40 deletions(-)
 create mode 100644 src/main/java/com/application/GUI/OutputPopUpWindow.java
 create mode 100644 target/classes/com/application/GUI/OutputPopUpWindow.class

diff --git a/src/main/java/com/application/DB/DB.java b/src/main/java/com/application/DB/DB.java
index 670782d..f0d3e4e 100644
--- a/src/main/java/com/application/DB/DB.java
+++ b/src/main/java/com/application/DB/DB.java
@@ -185,7 +185,6 @@ public class DB {
             }
             else break;
         }
-
         return getKwh(results);
     }
 
@@ -376,12 +375,15 @@ public class DB {
 
                     //System.out.println("Must be a string!!@@@@");
 
-                    // stores the value
-                    String value = (String) row.get("DryingStarted").getValue();
-                    // Splits the string based on 'T'
-                    String[] splitValue = value.split("T");
-                    // Combines the values into a new format
-                    formatedInTidTork = splitValue[0]+" "+splitValue[1];
+                    if(row.get("DryingStarted").getValue().toString().contains("T")){
+                        // stores the value
+                        String value = (String) row.get("DryingStarted").getValue();
+                        // Splits the string based on 'T'
+                        String[] splitValue = value.split("T");
+                        // Combines the values into a new format
+                        formatedInTidTork = splitValue[0]+" "+splitValue[1];
+                    }
+                    else formatedInTidTork = row.get("DryingStarted").getValue().toString();
                 }
 
                 // Checks if response is given in a string date format
@@ -401,12 +403,16 @@ public class DB {
             } catch(NumberFormatException e) {
                 //not long value, must be of type string
 
-                // stores the value
-                String value = (String) row.get("DryingCompleted").getValue();
-                // Splits the string based on 'T'
-                String[] splitValue = value.split("T");
-                // Combines the values into a new format
-                formatedUtTidTork = splitValue[0] + " " + splitValue[1];
+                if(row.get("DryingCompleted").getValue().toString().contains("T")){
+                    // stores the value
+                    String value = (String) row.get("DryingCompleted").getValue();
+                    // Splits the string based on 'T'
+                    String[] splitValue = value.split("T");
+                    // Combines the values into a new format
+                    formatedUtTidTork = splitValue[0] + " " + splitValue[1];
+                }
+                else formatedUtTidTork = row.get("DryingCompleted").getValue().toString();
+
             }
 
             //System.out.println("Inn formated: "+formatedInTidTork);
diff --git a/src/main/java/com/application/GUI/InputPopUpWindow.java b/src/main/java/com/application/GUI/InputPopUpWindow.java
index 0595c67..3477f80 100644
--- a/src/main/java/com/application/GUI/InputPopUpWindow.java
+++ b/src/main/java/com/application/GUI/InputPopUpWindow.java
@@ -8,12 +8,9 @@ import javafx.scene.control.*;
 import javafx.scene.layout.*;
 import javafx.stage.*;
 
-import java.util.Map;
-import java.util.concurrent.*;
-
 import static com.application.DB.Constants.*;
+import static com.application.Main.*;
 import static com.application.DB.DB.setInputParameters;
-import static com.application.GUI.LineChartFunctionality.loadMultipleSeries;
 import static com.application.GUI.LineChartFunctionality.loadSingleSeries;
 
 
@@ -25,12 +22,6 @@ import static com.application.GUI.LineChartFunctionality.loadSingleSeries;
  */
 public class InputPopUpWindow {
 
-    private static final Integer SLEEP_MILLS = 3000;
-    private static final Integer RUN_SLEEP_MILLS = 1000;
-    private static int afterSeconds = SLEEP_MILLS / RUN_SLEEP_MILLS;
-
-
-
     public static void display() {
         Stage window = new Stage();
 
@@ -58,10 +49,16 @@ public class InputPopUpWindow {
         Label dimensionsInputLabel = new Label("Dimensions");
         dimensionsInputLabel.setId("inputLabel");
         ObservableList<String> dimensions = FXCollections.observableArrayList(
-                        "47x150",
-                        "47x200",
-                        "50x150",
-                        "50x200"
+         "47x150",
+                "47x175",
+                "47x200",
+                "47x225",
+                "47x250",
+                "50x150",
+                "50x175",
+                "50x200",
+                "50x225",
+                "50x250"
                 );
         ComboBox<String> dimensionsList = new ComboBox<String>(dimensions);
         dimensionsList.setPromptText("Select Dimensions");
@@ -112,13 +109,16 @@ public class InputPopUpWindow {
                     SAWSET = sawsetList.getValue();
                     MOISTURE_GOAL = moistureList.getValue();
 
-                    // If the input is null, sets the corresponding value to be empty
+                    // If the input is null, sets the value to be empty
                     if(treeSpeciesList.getValue() == null){TREE_SPECIES = "";}
                     if(dimensionsList.getValue() == null){DIMENSIONS = "";}
                     if(sawsetList.getValue() == null){SAWSET = "";}
                     if(moistureList.getValue() == null){MOISTURE_GOAL = "";}
 
-
+                    setTreeSpeciesText(TREE_SPECIES);
+                    setDimensionsText(DIMENSIONS);
+                    setSawsetText(SAWSET);
+                    setMoistureGoalText(MOISTURE_GOAL);
 
                     window.close();
 
diff --git a/src/main/java/com/application/GUI/OutputPopUpWindow.java b/src/main/java/com/application/GUI/OutputPopUpWindow.java
new file mode 100644
index 0000000..7b651c7
--- /dev/null
+++ b/src/main/java/com/application/GUI/OutputPopUpWindow.java
@@ -0,0 +1,53 @@
+package com.application.GUI;
+
+import javafx.geometry.Pos;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+
+public class OutputPopUpWindow {
+
+    public static void displayOutputWindow(){
+
+        Stage window = new Stage();
+        window.initModality(Modality.APPLICATION_MODAL);
+        window.setTitle("Moisture Check");
+
+        // Top
+        Label moistureCheckLabelHuge = new Label("Moisture Check");
+        moistureCheckLabelHuge.setId("inputTop");
+        moistureCheckLabelHuge.setAlignment(Pos.TOP_CENTER);
+
+        // Center - Output field
+        Label moistureCheckLabelSmall = new Label("Moisture Check:");
+        moistureCheckLabelSmall.setId("inputLabel");
+        moistureCheckLabelSmall.setAlignment(Pos.CENTER);
+        TextField moistureCheckTextField = new TextField();
+        moistureCheckTextField.setId("inputLabel");
+        moistureCheckTextField.setAlignment(Pos.CENTER);
+
+        // Bottom - Buttons
+        Button countinueButton = new Button("Continue");
+        countinueButton.setId("inputButtonStart");
+        countinueButton.setAlignment(Pos.BOTTOM_CENTER);
+        Button finishButton = new Button("Finish");
+        finishButton.setId("inputButtonStart");
+        finishButton.setAlignment(Pos.BOTTOM_CENTER);
+
+
+        VBox layout = new VBox(10);
+        layout.setAlignment(Pos.CENTER);
+        layout.getChildren().addAll(moistureCheckLabelHuge,moistureCheckLabelSmall,moistureCheckTextField,countinueButton,finishButton);
+
+        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 e8b5541..bd571fe 100644
--- a/src/main/java/com/application/Main.java
+++ b/src/main/java/com/application/Main.java
@@ -1,6 +1,7 @@
 package com.application;
 
 import com.application.GUI.InputPopUpWindow;
+import com.application.GUI.OutputPopUpWindow;
 import com.application.GUI.RingProgressIndicator;
 import com.application.GUI.LineChartFunctionality;
 
@@ -19,6 +20,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.logging.Logger;
 
+import static com.application.DB.Constants.*;
 import static java.util.logging.Level.SEVERE;
 
 /**
@@ -35,6 +37,11 @@ public class Main extends Application {
     private MenuBar menuBar;
     private LineChartFunctionality lineChartFunctionality;
 
+    private static TextField treeSpeciesText;
+    private static TextField dimensionsText;
+    private static TextField sawsetText;
+    private static TextField moistureGoalText;
+
     /**
      * Starts the application
      *
@@ -151,28 +158,35 @@ public class Main extends Application {
 
         Label treeSpeciesLabel = new Label("Tree Species");
         treeSpeciesLabel.setId("sideBarLabelText");
-        TextField treeSpeciesText = new TextField();
+        treeSpeciesText = new TextField();
         treeSpeciesText.setId("sideBarLabelText");
-        treeSpeciesText.setPromptText("Bjørk");
-        treeSpeciesText.getText();
+        treeSpeciesText.setPromptText("Gran");
+        treeSpeciesText.setText(TREE_SPECIES);
+        treeSpeciesText.setEditable(false);
 
         Label dimensionsLabel = new Label("Width x Height");
         dimensionsLabel.setId("sideBarLabelText");
-        TextField dimensionsText = new TextField();
+        dimensionsText = new TextField();
         dimensionsText.setId("sideBarLabelText");
         dimensionsText.setPromptText("47 x 150");
+        dimensionsText.setText(DIMENSIONS);
+        dimensionsText.setEditable(false);
 
         Label sawsetLabel = new Label("Sawset");
         sawsetLabel.setId("sideBarLabelText");
-        TextField sawsetText = new TextField();
+        sawsetText = new TextField();
         sawsetText.setId("sideBarLabelText");
         sawsetText.setPromptText("4x");
+        sawsetText.setText(SAWSET);
+        sawsetText.setEditable(false);
 
         Label moistureGoalLabel = new Label("Moisture Goal");
         moistureGoalLabel.setId("sideBarLabelText");
-        TextField moistureGoalText = new TextField();
+        moistureGoalText = new TextField();
         moistureGoalText.setId("sideBarLabelText");
-        moistureGoalText.setPromptText("12%");
+        moistureGoalText.setPromptText("16%");
+        moistureGoalText.setText(MOISTURE_GOAL);
+        moistureGoalText.setEditable(false);
 
         Button inputParametersButton = new Button("Input Parameters");
         inputParametersButton.setId("sideBarButtonInputParameters");
@@ -180,6 +194,7 @@ public class Main extends Application {
 
         Button finishButton = new Button("Finish");
         finishButton.setId("sideBarButtonFinish");
+        finishButton.setOnAction(e -> OutputPopUpWindow.displayOutputWindow());
 
 
 
@@ -230,9 +245,6 @@ public class Main extends Application {
         VBox.setVgrow(sideBarVBox, Priority.ALWAYS);
 
         return sideBarVBox;
-
-
-
     }
 
 
@@ -266,6 +278,25 @@ public class Main extends Application {
 
         return new HBox(imageViewM, region1, imageViewTitle, region2);
     }
+
+
+
+
+    public static void setTreeSpeciesText(String treeSpeciesText) {
+        Main.treeSpeciesText.setText(treeSpeciesText);
+    }
+
+    public static void setDimensionsText(String dimensionsText)  {
+        Main.dimensionsText.setText(dimensionsText);
+    }
+
+    public static void setSawsetText(String sawsetText) {
+        Main.sawsetText.setText(sawsetText);
+    }
+
+    public static void setMoistureGoalText(String moistureGoalText) {
+        Main.moistureGoalText.setText(moistureGoalText);
+    }
 }
 
 
diff --git a/src/main/resources/com.application/CSS/styleSheet.css b/src/main/resources/com.application/CSS/styleSheet.css
index dcd1a78..9eacafe 100644
--- a/src/main/resources/com.application/CSS/styleSheet.css
+++ b/src/main/resources/com.application/CSS/styleSheet.css
@@ -110,6 +110,7 @@
     -fx-font-family: Arial;
     -fx-background-color: rgba(12, 76, 81, 1);
     -fx-text-fill: white;
+    -fx-alignment: bottom-center;
 }
 
 
diff --git a/target/classes/com.application/CSS/styleSheet.css b/target/classes/com.application/CSS/styleSheet.css
index 9669a07..9eacafe 100644
--- a/target/classes/com.application/CSS/styleSheet.css
+++ b/target/classes/com.application/CSS/styleSheet.css
@@ -93,7 +93,7 @@
     -fx-font-family: Arial;
 }
 
-#inputLabelText {
+#inputDropDownBox {
     -fx-pref-height: 17;
     -fx-translate-x: 5;
     -fx-max-height: infinity;
@@ -110,6 +110,7 @@
     -fx-font-family: Arial;
     -fx-background-color: rgba(12, 76, 81, 1);
     -fx-text-fill: white;
+    -fx-alignment: bottom-center;
 }
 
 
diff --git a/target/classes/com/application/DB/Constants.class b/target/classes/com/application/DB/Constants.class
index e9f7b13a7cc2894e84287aeae17f80c67373d3ee..a8e88ad82c3a058c24d18c8c9e69908098dfe753 100644
GIT binary patch
delta 743
zcmdnX+r=An>ff$?3=9k=3@Ka;0t}8E3{G4O&I~S`4EzkPTnugu?jWuQi0jG0;02<+
zL4*&8@C6ZmAi^I+1h6v%vNHrt3{T<aa`E(a^$Yg&_Y0nQFMu(4vOc4ZXb2+%Ux=fV
zk88Z2qpxeccen=!L+IoJMiIL(Mh3y)5XYd9c$c6^Pd|6C0uF|7Mh1c45dQ#F(FjHc
zE^kjCPd})t$jOHoRW+hOhI{(D28THM20&$^85wxP9DPDv<2_xVLNSy1nHEHvGgvS(
z2v=5CR_glt>ZYV9cz9Ul=2{gOvopl<FvKy$^Dqc92(dFH@GvAYB!M`|JPg7NB8&_S
zJPe`?B0LOYAVM5ONPq}Q1}Po}9R{h*yv!#U>-iZ37#J8t88|?uFfcGkg7h*lFmQtO
zf@v`Z5il(dr6r)WB!d)Ky)=Ue10#bB0|NsSgDit2gB*htoG;HH$)JEFugD<DpoGL%
zu4j;BP(cz<Wsqc0L*lD5NHS<3@iiGF8MKi2+6<f^zknU0i)67LgCv7Kk~#whNd`kC
zz7c~YgE4~$gDTABCJd4crbq^uF)%SOF_<%0FfcM$PGS=?w_;#m;9_86U|`^5U||qo
zux0=SFe3v411p0KgDnFC0|$d0L^%TkLn>G$1B2mYUp5U<mdy;j9Ge;VHZm|UFfxEl
ZQexnk+|MS>FUz3AV8Fo0U=I#H2LSMXSHJ)O

delta 816
zcmeC;-OC$(>ff$?3=9k=4C!19f(*_a3@%&@t_*IR3<3=9Tnruzo*=Fli0jS4-~*z4
zL4+TO@COkAAR-V%1c8WPc7_mkhR}&YDa!oeo-QFC@h+aeu6`k&{(g)M0v@iO?j9is
zp@|0r7{ewDG3q#mGcxdnI6C>b#``(?y2g8ldvGvBFf#Cic>#_=j=qi|u0g>Z43Ufs
zg25q<K_T%jL6M$*?qKyC3{jKo8AS!785y{|J$*d=prSF8molnq#DdKB^mPpmar6y<
z%EU1;@P;}1gu2Fix<G~ECx2pG5NF9?#mFFBSy@@B>+7qVlA_?@VU?R}Rb0%@kif%`
z$dJUtAjBZd&XCN*kiw7(;-v8~h%ksUGBEHkh%t!rFo=T)2@oL(BBVfsG=mHegC2v-
z=GROo80!TX1Q{3@#27e0MlmojNP-MtU|`?`833lm8AQRf1eBJ9(o#@bnn4DvPnJQH
zfssLufq{XEL7qX9L4iRA&R1lRWKcqqS7wl8PyzAlp&C>fBpK8|0#Lp>gCv6n5?_-+
zl0gfJugxIIpo7HMW#9z)3G5JkB#R9gBpD2m)EO~IG8iNA>rEIW8BCD`%orpY%#jSR
zU|?ckVz6YeVqj#jW?*12W?*DsWME)m)!NR$xDo7G8wLgjE(RtB1_nL`76t(ZTLw`0
zgB3B@G1xOOFmNz9zzxU)t7Kp>6JpxIz&u%lO<78aV>1IU>t+T%j?E1GATt>mKxV2j
ba86EOlNOd@&}EQgFk~=fU}SIv+vo%U<8)*q

diff --git a/target/classes/com/application/DB/DB.class b/target/classes/com/application/DB/DB.class
index f6de3c037d0b46daa2274512d5f7e0109cf16b89..82478f7c1f0a59ad25689f282837d8015f388f7a 100644
GIT binary patch
delta 5331
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
VqdW^IqXwfIn6_jzXOw4<1OQAh>s$Z;

delta 5486
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
QsK%%Qrp*~m8D$wH0SM^|nE(I)

diff --git a/target/classes/com/application/GUI/InputPopUpWindow.class b/target/classes/com/application/GUI/InputPopUpWindow.class
index 9ea2513d2c3ca6d86f03a8c1eccdbd16db02f761..c7a5a61caaaf14b86600a4d4bcf9d9e5cbb3e30b 100644
GIT binary patch
delta 2233
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
U1E>}Um1hSTm>CW+9A-EI0Ear;82|tP

delta 2225
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
Tl3_QrRNKSA%&?bXAH#kCwUpE*

diff --git a/target/classes/com/application/GUI/LineChartFunctionality.class b/target/classes/com/application/GUI/LineChartFunctionality.class
index 91dc1af6a9f30bf19ccc6610890a96bfcee57fc4..6f28f534a0484a9e319c2585678a0b527fd50c78 100644
GIT binary patch
delta 1444
zcmaE>JX5*;)W2Q(7#J8#81`{7=rH84GvsnHFfrtCGH5g8u`}dzF|a~71?&ukTnrox
zMIf1C4u%qtvQiLH#=%eyQdSBg$~YJ*K*}mXL=`tfHA4-EsO4hNW~k$4kY%XnW@un&
z<Ys7MXa*6!E$j@f+ziqTZR`x~><pb;3~~%PAeVG;Fm!V<^f2^tG4wI?gM_Qt876>4
zCV@mIb1|qgOaYlX6+}#9XPC~;Fk|Dza#p#SV3S(e89EsmxLhleQwvHm^Ye<?8D=pu
z%-5LwpH*sd1KaG$itO6VrVM72{n=I63>l0V8Du9u6rS9}&ckNRV8X~CGx4EJJr9E^
z!)zV~T?Rcy1{RmZl2jgsISg}o80Im|XJlaZF3(_O5O67~%*;zy2q?-=PAx7@E#_fZ
z08+A$VG%pSVjhMi3`=<!mNA&|FnEKA<qRv>8CLQztYTQr&M=dQVGYAt9)@)c>lqn@
zvl7b^^-D`KbM$=^3shY5N{VDEc^Ec;<akl!*cmo5GAK^o$gC*I!?1~AGb00|Ejz;&
z9)_(9+t?Yl^DyjS*g3hMLtAPW!)_jiT?~6b-q_2-;LPC0!{ET+$jG2I`8}i7W;V`;
zOlAy<4B8Aj3=9m+3|t_OGB7geGcYhPF&Hp#F&Hu!F)%Q2F&HzLFfcH%GcYokGMF(i
zGMG<}<4It&n7p4yzuuC8fq{pCk%581pTUa3nt_3Vlfj0;mVt@EoPmMCm4Oi~$EvlN
zfomh!8Vj(IObiSRattgC@(c(ASiufpV6cN52@)}2V1PQwo`DnOeyGthV1qRo7+5wj
zaBW~<U|?hb8O;V3R)T7AV&DY%8>D6OG+udEkP1+uWnfTa;AK!pvYd~>oxy_v*>aGG
zC){!`22M~Ef_?vsS5^{Xk`@CugEj*vgAao*12cp9WCOl!j24rh^SOh=CXIoMA)djU
z!H>b8frBA~L60GTA&`NSA&)_WA&9}Bfs3J>L7pL)A%uaOA%ek<A(SDEft^8zp@<=z
zA%cOK!IUABA(Fv^frY_>A&nu5A%uaIL5ZP;A(|nU0ThT!8R8fspzc<HtM_DJVNj|E
zD~pFKOJHDNNCbO`<qrctJ44cc22%!hc7|kjh9q`|6fh%|k)0ulf#DZJ@PAN*voj<!
zFfgPsFfgz%Ffyb=Lp6helOYr0TLuQkxeTlf+zbp1GqrXyh%++mWRPHF@X_AMAUWAU
zptXJngBB=qK+b1iFk|3lU|<MlkY@;C&}0Z_Fk*;c2x5q0h-8RnNMeX#$Y6+NC}c=x
z=we7^=w(P_n8c9IFqI(#98EC{oD7i+hTwn%xlscgkf0z{0tX}~Lm`7CI3T$gf*35o
z0m;TtugQ=J4M`)01ZYUgGZe$aZzfv!K~#al526YZd>~b@;L~GZ`NO~i4n89WHgKpR
zf)C^}hF=W6u+RggWz67XV#oq#vTO!d1_lNx24)61h7JZ721y2K23dv}Hckdrh7N{_
G43Yqb(cg3c

delta 1554
zcmbQK{8qXC)W2Q(7#J8#7>;r==rZK7GvsqIFfrtDGUzZAurm~LF|a~7MeGd4Tnrox
zB_Nqn4u&$2vT_hn!NE`oQdSNkDmWObK+38?L=87XEkhlMsOMtPVQAoHkY#A(W@ut)
z=4NPNXax~LZR`x~+ziqT9qbI9><ryp3~~&4AeZ!TF!XXU^fB~vF-%~X2okPgXP5*M
znF11-%Eh3{Fb!ntbPzFvi(w|iEOv(3><n`@o+)RQnhQ3rot>eZk%7y#B0067Br`v+
zn4MwX<XE<yEX>*A8IwiWb=k}q%o!QvCr2>Kv+^()F&IzIW>;c1VKALMfn8D3jA1?x
zgC2uEBLj;|Vo53w!vcndJPeB%7EeCKE}gmr#97L)jGbXQ55o$El{^fq7|eMXd_cr%
zhBfRAYk3&fF|222n9IYkfng&L!zPB!j10nAiDilUr6rj;`o4(;Dz14YMU^}ZTR>90
zC{pYUTNxP?C$C{vl;L66#;~1{fzg(oVFwSxPKI6V47+(4_Au-PIeiVYw7yGXNg~9N
zi98JZ81{pR13V073<r4_To~MW7#ta#*clG-FdSw$!pNXC`4ywq=Fc1tnd%uCM3eJ#
z^%DyUax#+>K|!SN;-v55#K<62oLb_US5R6KkXV$Mn_7}uRLsaAsG;eD;z(--MFt%P
zT?PgQW(F=$P%$tv7%(s}FfkZ1aDl>;fq{XG!Gyt-fq{XYfsw(C!JL7S!GeK-VJ-s;
z1LI^No(M+E$=N*m^;QfF3_J{s3=9nZ4Au-b3=9mM47Ln*3`}6vt_+M|IaaOB3|t$*
z)>(p$W@2DqkYiwBkY_*`zzTK<1A{%>NRWsj0|V4)4h)>20D&4U12%ZFBri`r$VfIY
zR|%@rnSm1&fKa7=3`}5IzD*2V+Zcqkb~1=CF@&Q#M~#7(K^@6Cd<-58o(#y&0f~6Q
zo#V~G2}(2!j22+8YJja^VBmpRvXeoSkpW}{BLm2JpbW>rpvAz=pv}O^;LG60z|3GV
z`3~<kM$5^Q`P{+5n8v`x5YJ%F;Li}iz`>BgpvMr%5X8XAkjJ3G5X=z3z{OC`AkPrO
z5X!*K5W!%_5XKPBz|Nq<P{a_y5Xr#IV9Jom5XIohz`|g`kj4<r5X!*Hpu|wa5W^71
z01EG=4Dk$+P!B1<)q63pFeuf7l_kKHB{DEDBrz~B=rgeVVc=(HNdC`Y%D~RfkiyQ8
z%+8PsW~4E)GbA%G{9*|H4@x8K3@Ho@4CxFEpajB@0gZ@E22O@726IS6FfL_aW#DFD
zV3@UoLEBqvCxbX6!%hYXMh2hBSNJ>YL7~M04lOGNJ_ZJc00tI@U<PG|5C&a_a0WAm
z2!=3*D27;uXofU~7=|2%ScX!DWQIP5RECKRX$;dC(ivtl<bxwHhJlkImcbAllI#p=
z3>x5&<Y35QPy&Y}CqpTNBse6w7{VAVz#++2&!EeY2@Og!h6HF(Dl-&A1CWJb8bdZp
z076uO0uZ7K6n+p@u<$cvVEM}+01mF?{|rV9Y!D_q2%#b93kpFiM)V+LV#opK$y^3E
i1_lNx24)61hAswI21y2K23dw!HckdrhAxK543YrZWce5X

diff --git a/target/classes/com/application/GUI/OutputPopUpWindow.class b/target/classes/com/application/GUI/OutputPopUpWindow.class
new file mode 100644
index 0000000000000000000000000000000000000000..c8972540dd67702c1f8cd361d98d6357e1aedfda
GIT binary patch
literal 2459
zcmX^0Z`VEs1_l#`SzHVz48H6Peq0Pp48EKU{tN*iRv-sM5Qq+DX9(e9;9v;lU<d=z
z;hYQ+43QvK6bC~z2SW^qAIr`V$HgGX;0q$cK|~ZgLp%pV0vCfQNM|C52J1`$v7$H_
zlGzzj*c?<Cz<`TEmLU~HM1hDjc7}9rh75*Gc7`lAho%EyC2S7$4qyfsgDOKdh{$1Q
z$mL+j<6_8XDBxl!WGDjZDF!*Y1VogwGnBD2lru80*<|Krme?^eFl%UrF*2|?=clAH
zGVuFk=B4_T<|d^Ug(N2Bq%txH`Q#@j=7c2{WrFxnL6(w?%wk3cb)V$?T>Zp?f}G6c
z#FEVXJbm|2PksN=l7iBbfc%2cg7D0|l>BmQMh4-O%;JKa#7c-9M3|9*tsE@R$ROgA
zl~|UTR-s>9l9-;V9}FU`85zWK^D~P}N{dpRGg6bYeG-#Wb397ZQyCd#;Odi8^HTMb
z^YcoI@^kdTDy$h9#4+^+=O*Ulpqm(yT2bPbnVOTr$e@7TM7RoTMh5=m{L;LV%)HW6
zr_z#={5(bmS?ro1($<U&JZYJEnZ+3pJ|hELPGV(#X$d2P6skUmuzr|ReuXt718XtJ
zPsm{c;_C;4NNYw0uHgLAqU2P!Oi<*ALBbO$to1+v$-`jEV8+NG1Y)BGDmz034?`tG
z6%Ru-Lk%MXpD#3k6~H0P!%)jm$H*WB(+9E=HE=;D*D*41Wabr=mW1RN@G#Uf)Uh)(
z@GvwoH1RMrGqf-=@S_@P#mK+~Rt}CG9)?ziCPoH1tX9B7n~^~ps{&X^ayaKhVuF!D
z0BklyBDf^6sDy{14P*nG8#wG486;3lLJDh;U)p&XIv6?`83a)j`Q@jivNLq?FmyBY
zAO#~hIKc4$(%Q?z&<E10f-Mhtg2D$WS{NCW^^@~+^^o(5b8xVJaY<!PYH&tsYKdNQ
zaWOkXKM%tMhKcM9lXw^=Gfd%On94AXhhaLy3?7D=pcqxfW*0^pU}O*gc}G7dF)v-;
zKPf9UxrC8H6eI*s48Hj(i8+}im5dC6jsXEap3aUTp8kIEzWy$bK8y_F@bn4Fi25+a
zpcD-%G+=y21}P03DnUgGM{#ONNM;Eror*%#L0lAEQk0pOZVghxTAW(qnZn2*40T+3
zYJP5NNl~SKKz=bJ16PQDK)kc7Ux;fEBZDZ+CS)}r7Zs<LIOb%g=jEp6l`t|$Kx|5@
z&__`RvWyL86t9ziNQl2L+-MdJ7mz%6dTNPtMrKY*QEDC|gQ|um%*N#WoSf8TQ2AD@
z@1InhT2uxq3Vkw*ORO0g6roPXt%#9<Eiom<5nTLeM1u{51Oy~%tTm%h0ur3c0uqZ-
z^Gd8;zz*X}Pb~=sC6r=NLMdis;0M_WF~d10vACF#0p#|e)M9Yaz{sEk2?U4=Sa3ru
z&Py%P4-N7G1svEAD4&smuO#2Kq9nB_FEPh0zbKcHK?E8AD5fwnFej#@FfyP-D3U)w
zaSqNQj11xsM}U$X*h^qxaIA9|XXKYV=B0!uW|lB0G8i+MfU7Vj21Zc1#lXm5&cMK+
z&%nsQ$iTqBs<oYgaU%l*0~3P<0|NsaSdf>&l7WGN2h3(=uwt-gU|`^6uwgKRXl6Xc
zz|O$Iz`*crHv?1Tb_Ql|txXIp+Zb52gxIz*u<vHzh!kSm&cNxTEyT5rfm?eM1J5=F
zUa&CVb_Pyg9U=a04BR@K7zDt=f|1)9g#2_tg2K9BL6O}IqLD&k+Zn{ISR`45B(^a~
zO0sNXklMx|4VIAs$*@YYLS$HBGP02(4078U6s*`J*}&!~O0sQZP~zCjpd87p9URG`
z6CBB^8yv|d$r2pNF3B3alR<@vA$&K3YNRBa2!omkgT{6SEh~0O_H7K>LOMda+Zgn=
zG3f7PFkoT`*8+(eYHedMLWEWpgA@Y;gCGM3gAfBhgD`_AgBXK6gE)gKg9L*PgEWH~
zgA9WWgDitHgB*i5gFHhZg91YYgEB)hg9<|ygDOK2gBn9EgE~VCg9bwngEqqq1|5b4
z47v<Q8T1*hF&HqsW-w&<$Y8|qmBAPsBS8!t3>*ya7;G8r7#JAj8Ll(fGdM6XGMF(O
zU~pt`U|?eKW?0SO#Nf=p%#h45nZbp@m4St!mZ6ftjlq?Hm0<=$9D_T92Ll_!H3kI+
RPX;drb_PZUZ*c7U000dIiKzep

literal 0
HcmV?d00001

-- 
GitLab