diff --git a/README.md b/README.md index c1f9c8a9d8e011fa3d05d8bd02888010eb10349b..92f4df5a59ea8ce8f546ab3f4beb2d55e784009a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,20 @@ -Bachelor oppgave vår 2022 -Awesome teamates: +#Bachelor Thesis Spring 2022 + +This application visualize live- and historical data and calculates an estimate based on logistic regression that the drying operator can choose to follow in order to minimize over-drying. + + +The development team: +* #### Eilert Tunheim +* #### Mads Greni Arnesen +* #### Karin Pettersen + +Link to repo: https://git.gvk.idi.ntnu.no/mesji/bacheloroppgave_2022 + +## Deployment Instructions + +The java .jar file is located under `out\artifacts\Bachelor_application` + +In order to run the jar file, please use the following command: + +`java -jar Bachelor_application.jar` -Karin -Mads -Eilert diff --git a/src/main/java/com/application/GUI/PopUpWindows/InputPopup.java b/src/main/java/com/application/GUI/PopUpWindows/InputPopup.java index 5059812c1319c0ef145c3e3d5be0641e6d101906..6ff2fb0f57af604109587da113fb48a1419525dc 100644 --- a/src/main/java/com/application/GUI/PopUpWindows/InputPopup.java +++ b/src/main/java/com/application/GUI/PopUpWindows/InputPopup.java @@ -172,24 +172,17 @@ public class InputPopup { moistureList.setValue(""); } - - - if (!err) { - setTreeSpeciesText(Constants.TREE_SPECIES); setDimensionsText(Constants.DIMENSIONS); setSawsetText(Constants.SAWSET); setMoistureGoalText(Constants.MOISTURE_GOAL); window.close(); + NotificationPopUp.displayNotificationWindow("Searching for data..."); - - - - // Fungerende ny thread!!@@@@@ - // Gather data + // Gather data thread try { Thread thread = new Thread(() -> { @@ -251,94 +244,8 @@ public class InputPopup { } catch (Exception ex) { ex.printStackTrace(); } - - } else { - - } - } - - ); - -/* - // Fungerende ny thread!!@@@@@ - try{ - Thread thread = new Thread(new Runnable() { - - @Override - public void run() { - try { - // Henter her data fra databasen - loadSingleSeries(setInputParameters()); - //loadSingleSeries(); - //loadMultipleSeries(); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - }); - thread.start(); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - - ); - */ - - - - - -/* - class KwhThread implements Runnable { - - Map<Integer, Map<String, Number>> dataVariable; - private volatile boolean finished; - - @Override - public void run() { - try{ - dataVariable = setInputParameters(); - } catch (Exception ex) { - ex.printStackTrace(); - } - finished = true; - - synchronized (this){ - this.notify(); - } - } - - public Map<Integer, Map<String, Number>> getDataVariable() throws InterruptedException { - - synchronized (this){ - if(!finished) - this.wait(); - } - return dataVariable; - } - } - - KwhThread kwhThread = new KwhThread(); - - Thread thread = new Thread(kwhThread); - thread.setName("GetKwhThread"); - thread.start(); - - try { - loadSingleSeries(kwhThread.getDataVariable()); - } catch (Exception ex) { - ex.printStackTrace(); - } - - - */ - -/* - - - */ - + } + }); VBox layout = new VBox(10); layout.getChildren().addAll(inputLabel, treeSpeciesInputLabel, treeSpeciesList, dimensionsInputLabel, dimensionsList, diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000000000000000000000000000000000000..797d99b7b0f4c83c466174cd972c3ce28a801788 --- /dev/null +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: com.application.Main + diff --git a/target/classes/com/application/GUI/PopUpWindows/InputPopup.class b/target/classes/com/application/GUI/PopUpWindows/InputPopup.class index 62565f7fd11a5290ee8e17ea4cd00fa91f1b4bb7..41711d43061130bffbefb039bac7ba4beb73d9b6 100644 Binary files a/target/classes/com/application/GUI/PopUpWindows/InputPopup.class and b/target/classes/com/application/GUI/PopUpWindows/InputPopup.class differ