From 9a4c0d4e38659bc11a86dbf1ab4f909d64dcf57f Mon Sep 17 00:00:00 2001
From: Eilert Tunheim <emtunhei@stud.ntnu.no>
Date: Wed, 18 May 2022 23:22:36 +0200
Subject: [PATCH] Added readme file
---
README.md | 24 ++++-
.../GUI/PopUpWindows/InputPopup.java | 101 +-----------------
src/main/resources/META-INF/MANIFEST.MF | 3 +
.../GUI/PopUpWindows/InputPopup.class | Bin 9135 -> 9171 bytes
4 files changed, 26 insertions(+), 102 deletions(-)
create mode 100644 src/main/resources/META-INF/MANIFEST.MF
diff --git a/README.md b/README.md
index c1f9c8a..92f4df5 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 5059812..6ff2fb0 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 0000000..797d99b
--- /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
GIT binary patch
delta 2870
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
ImBHu-01+;GyZ`_I
delta 2786
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
--
GitLab