Skip to content
Snippets Groups Projects
Commit 105b0b9e authored by Eilert Tunheim's avatar Eilert Tunheim
Browse files

Fixed searching for moisture sql statement, 42 drying periods now!

parent 66502b87
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/main/java/com/application/DB/Constants.java
+ 30
− 5
View file @ 105b0b9e
...@@ -2,6 +2,8 @@ package com.application.DB; ...@@ -2,6 +2,8 @@ package com.application.DB;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
/** /**
...@@ -44,6 +46,7 @@ public final class Constants { ...@@ -44,6 +46,7 @@ public final class Constants {
public static int VALASEN_KILIN_ID = 5; // Kammer 5 public static int VALASEN_KILIN_ID = 5; // Kammer 5
//public static int VALASEN_KILIN_ID = 6; // Kammer 6 //public static int VALASEN_KILIN_ID = 6; // Kammer 6
public static final int VALASEN_LIMIT = 1000; public static final int VALASEN_LIMIT = 1000;
public static final ArrayList<Integer> VALASEN_VALMETICS_CHAMBER_IDS = new ArrayList<>(Arrays.asList(5,6));
// Winccsensordata // Winccsensordata
public static final String VALASEN_KWH_NAME = "VariantValue"; public static final String VALASEN_KWH_NAME = "VariantValue";
...@@ -51,6 +54,7 @@ public final class Constants { ...@@ -51,6 +54,7 @@ public final class Constants {
public static final String VALASEN_VALUE_ID_NAME = "ValueID"; public static final String VALASEN_VALUE_ID_NAME = "ValueID";
public static final int VALASEN_VALUE_ID = 51; // Kammer 5 public static final int VALASEN_VALUE_ID = 51; // Kammer 5
//public static final int VALASEN_VALUE_ID = 56; // Kammer 6 //public static final int VALASEN_VALUE_ID = 56; // Kammer 6
public static final ArrayList<Integer> VALASEN_KWH_CHAMBER_IDS = new ArrayList<>(Arrays.asList(51,56));
...@@ -69,15 +73,17 @@ public final class Constants { ...@@ -69,15 +73,17 @@ public final class Constants {
public static final String ARJANG_START_DRYING_NAME = "DryingStarted"; public static final String ARJANG_START_DRYING_NAME = "DryingStarted";
public static final String ARJANG_STOP_DRYING_NAME = "DryingCompleted"; public static final String ARJANG_STOP_DRYING_NAME = "DryingCompleted";
public static final String ARJANG_KILIN_NAME = "KilinId"; public static final String ARJANG_KILIN_NAME = "KilinId";
public static int ARJANG_KILIN_ID = 18; //public static int ARJANG_KILIN_ID = 18;
//public static int ARJANG_KILIN_ID = 18554; //public static int ARJANG_KILIN_ID = 18554;
public static final int ARJANG_LIMIT = 1000; public static final int ARJANG_LIMIT = 1000;
public static final ArrayList<Integer> ARJANG_VALMETICS_CHAMBER_IDS = new ArrayList<>(Arrays.asList(17,18));
// Swappconsensordata // Swappconsensordata
public static final String ARJANG_KWH_NAME = "RealValue"; public static final String ARJANG_KWH_NAME = "RealValue";
public static final String ARJANG_TIMESTAMP_NAME = "Timestamp"; public static final String ARJANG_TIMESTAMP_NAME = "Timestamp";
public static final String ARJANG_VALUE_ID_NAME = "ValueID"; public static final String ARJANG_VALUE_ID_NAME = "ValueID";
public static final int ARJANG_VALUE_ID = 19; //public static final int ARJANG_VALUE_ID = 19;
public static final ArrayList<Integer> ARJANG_KWH_CHAMBER_IDS = new ArrayList<>(Arrays.asList(19,19));
...@@ -89,6 +95,7 @@ public final class Constants { ...@@ -89,6 +95,7 @@ public final class Constants {
return sawmillInfo; return sawmillInfo;
} }
// Valasen // Valasen
private static HashMap<String, HashMap<String, String>> getValasenTables(){ private static HashMap<String, HashMap<String, String>> getValasenTables(){
HashMap<String, HashMap<String, String>> valasenTables = new HashMap<>(); HashMap<String, HashMap<String, String>> valasenTables = new HashMap<>();
...@@ -110,20 +117,30 @@ public final class Constants { ...@@ -110,20 +117,30 @@ public final class Constants {
valasenValmeticsParameters.put("DryingStarted", VALASEN_START_DRYING_NAME); valasenValmeticsParameters.put("DryingStarted", VALASEN_START_DRYING_NAME);
valasenValmeticsParameters.put("DryingStopped", VALASEN_STOP_DRYING_NAME); valasenValmeticsParameters.put("DryingStopped", VALASEN_STOP_DRYING_NAME);
valasenValmeticsParameters.put("KilnName", VALASEN_KILIN_NAME); valasenValmeticsParameters.put("KilnName", VALASEN_KILIN_NAME);
valasenValmeticsParameters.put("KilinID", String.valueOf(VALASEN_KILIN_ID)); //valasenValmeticsParameters.put("KilinID", String.valueOf(VALASEN_KILIN_ID));
valasenValmeticsParameters.put("Limit", String.valueOf(VALASEN_LIMIT)); valasenValmeticsParameters.put("Limit", String.valueOf(VALASEN_LIMIT));
return valasenValmeticsParameters; return valasenValmeticsParameters;
} }
public static ArrayList<Integer> getValasenValmeticsChamberIDS(){
return VALASEN_VALMETICS_CHAMBER_IDS;
}
private static HashMap<String, String> getValasenWinccsensordataParameters(){ private static HashMap<String, String> getValasenWinccsensordataParameters(){
HashMap<String, String> valasenWinccsensordataParameters = new HashMap<>(); HashMap<String, String> valasenWinccsensordataParameters = new HashMap<>();
valasenWinccsensordataParameters.put("KwhName", VALASEN_KWH_NAME); valasenWinccsensordataParameters.put("KwhName", VALASEN_KWH_NAME);
valasenWinccsensordataParameters.put("Timestamp", VALASEN_TIMESTAMP_NAME); valasenWinccsensordataParameters.put("Timestamp", VALASEN_TIMESTAMP_NAME);
valasenWinccsensordataParameters.put("ValueIDName", VALASEN_VALUE_ID_NAME); valasenWinccsensordataParameters.put("ValueIDName", VALASEN_VALUE_ID_NAME);
valasenWinccsensordataParameters.put("ValueID", String.valueOf(VALASEN_VALUE_ID)); valasenWinccsensordataParameters.put("ValueID", String.valueOf(VALASEN_VALUE_ID));
//valasenWinccsensordataParameters.put("ValueID", String.valueOf(VALASEN_VALUE_ID));
return valasenWinccsensordataParameters; return valasenWinccsensordataParameters;
} }
public static ArrayList<Integer> getValasenKwhChamberIDS(){
return VALASEN_KWH_CHAMBER_IDS;
}
// Arjang // Arjang
private static HashMap<String, HashMap<String, String>> getArjangTables(){ private static HashMap<String, HashMap<String, String>> getArjangTables(){
HashMap<String, HashMap<String, String>> arjangTables = new HashMap<>(); HashMap<String, HashMap<String, String>> arjangTables = new HashMap<>();
...@@ -145,17 +162,25 @@ public final class Constants { ...@@ -145,17 +162,25 @@ public final class Constants {
arjangValmeticsParameters.put("DryingStarted", ARJANG_START_DRYING_NAME); arjangValmeticsParameters.put("DryingStarted", ARJANG_START_DRYING_NAME);
arjangValmeticsParameters.put("DryingStopped", ARJANG_STOP_DRYING_NAME); arjangValmeticsParameters.put("DryingStopped", ARJANG_STOP_DRYING_NAME);
arjangValmeticsParameters.put("KilnName", ARJANG_KILIN_NAME); arjangValmeticsParameters.put("KilnName", ARJANG_KILIN_NAME);
arjangValmeticsParameters.put("KilinID", String.valueOf(ARJANG_KILIN_ID)); //arjangValmeticsParameters.put("KilinID", String.valueOf(ARJANG_KILIN_ID));
arjangValmeticsParameters.put("Limit", String.valueOf(ARJANG_LIMIT)); arjangValmeticsParameters.put("Limit", String.valueOf(ARJANG_LIMIT));
return arjangValmeticsParameters; return arjangValmeticsParameters;
} }
public static ArrayList<Integer> getArjangValmeticsChamberIDS(){
return ARJANG_VALMETICS_CHAMBER_IDS;
}
private static HashMap<String, String> getArjangWinccsensordataParameters(){ private static HashMap<String, String> getArjangWinccsensordataParameters(){
HashMap<String, String> arjangWinccsensordataParameters = new HashMap<>(); HashMap<String, String> arjangWinccsensordataParameters = new HashMap<>();
arjangWinccsensordataParameters.put("KwhName", ARJANG_KWH_NAME); arjangWinccsensordataParameters.put("KwhName", ARJANG_KWH_NAME);
arjangWinccsensordataParameters.put("Timestamp", ARJANG_TIMESTAMP_NAME); arjangWinccsensordataParameters.put("Timestamp", ARJANG_TIMESTAMP_NAME);
arjangWinccsensordataParameters.put("ValueIDName", ARJANG_VALUE_ID_NAME); arjangWinccsensordataParameters.put("ValueIDName", ARJANG_VALUE_ID_NAME);
arjangWinccsensordataParameters.put("ValueID", String.valueOf(ARJANG_VALUE_ID)); //arjangWinccsensordataParameters.put("ValueID", String.valueOf(ARJANG_VALUE_ID));
return arjangWinccsensordataParameters; return arjangWinccsensordataParameters;
} }
public static ArrayList<Integer> getArjangKwhChamberIDS(){
return ARJANG_KWH_CHAMBER_IDS;
}
} }
src/main/java/com/application/DB/DB.java
+ 65
− 55
View file @ 105b0b9e
...@@ -127,10 +127,6 @@ public class DB { ...@@ -127,10 +127,6 @@ public class DB {
} }
public static void getData(){
}
public static Map<Integer, Map<String, Number>> setInputParameters() throws Exception { public static Map<Integer, Map<String, Number>> setInputParameters() throws Exception {
...@@ -141,6 +137,12 @@ public class DB { ...@@ -141,6 +137,12 @@ public class DB {
boolean dimensionsRemoved = false; boolean dimensionsRemoved = false;
boolean moistureRemoved = false; boolean moistureRemoved = false;
HashMap<java.lang.String, java.lang.String> locationTables = null;
ArrayList<Integer> valmeticsChamberIDS = null;
ArrayList<Integer> kwhChamberIDS = null;
int numberOfChambers;
String extraInputParameter = ""; String extraInputParameter = "";
int locationID; int locationID;
int index = 0; int index = 0;
...@@ -151,20 +153,20 @@ public class DB { ...@@ -151,20 +153,20 @@ public class DB {
String moistureGoal = ""; String moistureGoal = "";
// Valmetics parameters // Valmetics parameters
String nameParameter = ""; String nameParameter;
String kilinName = ""; String kilinName;
int kilinID = 0; int kilinID;
String startDryingTime = ""; String startDryingTime;
String stopDryingTime = ""; String stopDryingTime;
String valmeticsTableName = ""; String valmeticsTableName;
int limit = 0; int limit;
// Kwh parameters // Kwh parameters
String kwhTableName = ""; String kwhTableName;
String KwhName = ""; String KwhName;
String timestamp = ""; String timestamp;
String valueIDName = ""; String valueIDName;
int valueID = 0; int valueID;
while(true){ while(true){
...@@ -183,44 +185,35 @@ public class DB { ...@@ -183,44 +185,35 @@ public class DB {
//System.out.println(location.getValue()); //System.out.println(location.getValue());
if (location.getKey() == 124) { if (location.getKey() == 124) {
// Valmetics // If location is Valasen, then the database stores furu as fura, swedish.
valmeticsTableName = getValasenTableNames().get("Valmetics"); if (TREE_SPECIES.equalsIgnoreCase("Furu")) {
nameParameter = location.getValue().get(getValasenTableNames().get("Valmetics")).get("Name"); TREE_SPECIES = "Fura";
startDryingTime = location.getValue().get(getValasenTableNames().get("Valmetics")).get("DryingStarted"); }
stopDryingTime = location.getValue().get(getValasenTableNames().get("Valmetics")).get("DryingStopped"); locationTables = getValasenTableNames();
kilinName = location.getValue().get(getValasenTableNames().get("Valmetics")).get("KilnName"); valmeticsChamberIDS = getValasenValmeticsChamberIDS();
kilinID = Integer.parseInt(location.getValue().get(getValasenTableNames().get("Valmetics")).get("KilinID")); kwhChamberIDS = getValasenKwhChamberIDS();
limit = Integer.parseInt(location.getValue().get(getValasenTableNames().get("Valmetics")).get("Limit"));
// Kwh
kwhTableName = getValasenTableNames().get("Kwh");
KwhName = location.getValue().get(getValasenTableNames().get("Kwh")).get("KwhName");
timestamp = location.getValue().get(getValasenTableNames().get("Kwh")).get("Timestamp");
valueIDName = location.getValue().get(getValasenTableNames().get("Kwh")).get("ValueIDName");
valueID = Integer.parseInt(location.getValue().get(getValasenTableNames().get("Kwh")).get("ValueID"));
} }
if (location.getKey() == 174) { if (location.getKey() == 174) {
locationTables = getArjangTableNames();
valmeticsChamberIDS = getArjangValmeticsChamberIDS();
kwhChamberIDS = getArjangKwhChamberIDS();
}
// Valmetics // Valmetics
valmeticsTableName = getArjangTableNames().get("Valmetics"); valmeticsTableName = locationTables.get("Valmetics");
nameParameter = location.getValue().get(getArjangTableNames().get("Valmetics")).get("Name"); nameParameter = location.getValue().get(locationTables.get("Valmetics")).get("Name");
startDryingTime = location.getValue().get(getArjangTableNames().get("Valmetics")).get("DryingStarted"); startDryingTime = location.getValue().get(locationTables.get("Valmetics")).get("DryingStarted");
stopDryingTime = location.getValue().get(getArjangTableNames().get("Valmetics")).get("DryingStopped"); stopDryingTime = location.getValue().get(locationTables.get("Valmetics")).get("DryingStopped");
kilinName = location.getValue().get(getArjangTableNames().get("Valmetics")).get("KilnName"); kilinName = location.getValue().get(locationTables.get("Valmetics")).get("KilnName");
kilinID = Integer.parseInt(location.getValue().get(getArjangTableNames().get("Valmetics")).get("KilinID")); //kilinID = Integer.parseInt(location.getValue().get(locationTables.get("Valmetics")).get("KilinID"));
limit = Integer.parseInt(location.getValue().get(getArjangTableNames().get("Valmetics")).get("Limit")); limit = Integer.parseInt(location.getValue().get(locationTables.get("Valmetics")).get("Limit"));
// Kwh // Kwh
kwhTableName = getArjangTableNames().get("Kwh"); kwhTableName = locationTables.get("Kwh");
KwhName = location.getValue().get(getArjangTableNames().get("Kwh")).get("KwhName"); KwhName = location.getValue().get(locationTables.get("Kwh")).get("KwhName");
timestamp = location.getValue().get(getArjangTableNames().get("Kwh")).get("Timestamp"); timestamp = location.getValue().get(locationTables.get("Kwh")).get("Timestamp");
valueIDName = location.getValue().get(getArjangTableNames().get("Kwh")).get("ValueIDName"); valueIDName = location.getValue().get(locationTables.get("Kwh")).get("ValueIDName");
valueID = Integer.parseInt(location.getValue().get(getArjangTableNames().get("Kwh")).get("ValueID")); //valueID = Integer.parseInt(location.getValue().get(locationTables.get("Kwh")).get("ValueID"));
}
// If location is Valasen, then the database stores furu as fura, swedish.
if (location.getKey() == 124 && TREE_SPECIES.equalsIgnoreCase("Furu")) {
TREE_SPECIES = "Fura";
}
System.out.printf("Tree species: \t%s\n", TREE_SPECIES); System.out.printf("Tree species: \t%s\n", TREE_SPECIES);
...@@ -233,7 +226,7 @@ public class DB { ...@@ -233,7 +226,7 @@ public class DB {
treeSpecies = "AND LOWER(" + nameParameter + ") LIKE LOWER(" + '"' + "%" + TREE_SPECIES + "%" + '"' + ") "; treeSpecies = "AND LOWER(" + nameParameter + ") LIKE LOWER(" + '"' + "%" + TREE_SPECIES + "%" + '"' + ") ";
dimensions = "AND LOWER(" + nameParameter + ") LIKE LOWER(" + '"' + "%" + DIMENSIONS + "%" + '"' + ") "; dimensions = "AND LOWER(" + nameParameter + ") LIKE LOWER(" + '"' + "%" + DIMENSIONS + "%" + '"' + ") ";
sawset = "AND LOWER(" + nameParameter + ") LIKE LOWER(" + '"' + "%" + SAWSET + "%" + '"' + ") "; sawset = "AND LOWER(" + nameParameter + ") LIKE LOWER(" + '"' + "%" + SAWSET + "%" + '"' + ") ";
moistureGoal = "AND LOWER(" + nameParameter + ") LIKE LOWER(" + '"' + "%" + MOISTURE_GOAL + "%" + '"' + ") "; moistureGoal = "AND LOWER(" + nameParameter + ") LIKE LOWER(" + '"' + "%" + MOISTURE_GOAL + "\\\\%" + "%" + '"' + ") ";
// 1. Checking if user input is empty. // 1. Checking if user input is empty.
...@@ -255,6 +248,20 @@ public class DB { ...@@ -255,6 +248,20 @@ public class DB {
System.out.printf("\nExtra parameters:\n %s\n\n", extraInputParameter); System.out.printf("\nExtra parameters:\n %s\n\n", extraInputParameter);
// Sets the lowest number of chambers to iterate through
numberOfChambers = Math.min(valmeticsChamberIDS.size(), kwhChamberIDS.size());
System.out.printf("\nnumberOfChambers: \t%d\n",numberOfChambers);
for (int i = 0; i < numberOfChambers; i++) {
// Sets the kiln number
kilinID = valmeticsChamberIDS.get(i);
valueID = kwhChamberIDS.get(i);
System.out.printf("KilinID: \t%d\n",kilinID);
System.out.printf("valueID: \t%d\n",valueID);
//System.out.println("Før results"); //System.out.println("Før results");
Map<Integer, Map<String, Number>> results = new TreeMap<>(getKwh(getZeroPointDate(locationID, extraInputParameter, nameParameter, kilinName, kilinID, startDryingTime, stopDryingTime, valmeticsTableName, limit), Map<Integer, Map<String, Number>> results = new TreeMap<>(getKwh(getZeroPointDate(locationID, extraInputParameter, nameParameter, kilinName, kilinID, startDryingTime, stopDryingTime, valmeticsTableName, limit),
locationID, kwhTableName, KwhName, timestamp, valueIDName, valueID, index)); locationID, kwhTableName, KwhName, timestamp, valueIDName, valueID, index));
...@@ -264,6 +271,7 @@ public class DB { ...@@ -264,6 +271,7 @@ public class DB {
index += results.size(); index += results.size();
//System.out.println("Etter results"); //System.out.println("Etter results");
} }
}
System.out.printf("\nExtra parameters:\n %s\n\n", extraInputParameter); System.out.printf("\nExtra parameters:\n %s\n\n", extraInputParameter);
...@@ -272,7 +280,7 @@ public class DB { ...@@ -272,7 +280,7 @@ public class DB {
//results = getKwh(getZeroPointDate(locationID, extraInputParameter, nameParameter, kilinName, kilinID, startDryingTime, stopDryingTime, valmeticsTableName, limit)); //results = getKwh(getZeroPointDate(locationID, extraInputParameter, nameParameter, kilinName, kilinID, startDryingTime, stopDryingTime, valmeticsTableName, limit));
// Checks if any dates where found, if not parameters are removed until dates are found // Checks if any dates where found, if not parameters are removed until dates are found
if (intermediateHashMap.size() <= NUMBER_OF_PERIODS) { if (intermediateHashMap.size() < NUMBER_OF_PERIODS) {
//System.out.println("\nInni if, sletter parameter:\n"); //System.out.println("\nInni if, sletter parameter:\n");
if (extraInputParameter.contains(sawset) && !sawsetRemoved) { if (extraInputParameter.contains(sawset) && !sawsetRemoved) {
extraInputParameter = extraInputParameter.replace(sawset, ""); extraInputParameter = extraInputParameter.replace(sawset, "");
...@@ -384,7 +392,7 @@ public class DB { ...@@ -384,7 +392,7 @@ public class DB {
} }
} }
System.out.println("\nFinal results size: " + finalResults.size()); System.out.println("\nFinal results size: " + finalResults.size()+"\n\n");
// Defining a treemap to sort the data incrementally // Defining a treemap to sort the data incrementally
NavigableMap<Integer, Map<String, Number>> sortedFinalResults = new TreeMap<>(finalResults); NavigableMap<Integer, Map<String, Number>> sortedFinalResults = new TreeMap<>(finalResults);
...@@ -457,7 +465,7 @@ public class DB { ...@@ -457,7 +465,7 @@ public class DB {
// Defining variables // Defining variables
String formatedInTidTork = ""; String formatedInTidTork = "";
String formatedUtTidTork = ""; String formatedUtTidTork;
System.out.println(row.get("DryingSchedule").getStringValue()); System.out.println(row.get("DryingSchedule").getStringValue());
...@@ -537,11 +545,13 @@ public class DB { ...@@ -537,11 +545,13 @@ public class DB {
NavigableMap<String, String> sortedFinalResults = new TreeMap<>(dates); NavigableMap<String, String> sortedFinalResults = new TreeMap<>(dates);
System.out.println("\n"); System.out.println("\n");
/*
for (Map.Entry<String, String> entry : sortedFinalResults.entrySet()) { for (Map.Entry<String, String> entry : sortedFinalResults.entrySet()) {
System.out.printf("Intid: \t%s\t\t\tUttid: \t%s\n",entry.getKey(),entry.getValue()); System.out.printf("Intid: \t%s\t\t\tUttid: \t%s\n",entry.getKey(),entry.getValue());
} }
*/
System.out.printf("Size of dates: %s\n\n", sortedFinalResults.size()); System.out.printf("Size of dates: %s\n\n", sortedFinalResults.size());
......
src/main/java/com/application/GUI/InputPopUpWindow.java
+ 14
− 8
View file @ 105b0b9e
...@@ -55,7 +55,7 @@ public class InputPopUpWindow { ...@@ -55,7 +55,7 @@ public class InputPopUpWindow {
"Furu", "Furu",
"Gran" "Gran"
); );
ComboBox<String> treeSpeciesList = new ComboBox<String>(treeSpecies); ComboBox<String> treeSpeciesList = new ComboBox<>(treeSpecies);
treeSpeciesList.setPromptText("Select Tree Species"); treeSpeciesList.setPromptText("Select Tree Species");
treeSpeciesList.setId("inputDropDownBox"); treeSpeciesList.setId("inputDropDownBox");
treeSpeciesList.setEditable(true); treeSpeciesList.setEditable(true);
...@@ -75,7 +75,7 @@ public class InputPopUpWindow { ...@@ -75,7 +75,7 @@ public class InputPopUpWindow {
"50x225", "50x225",
"50x250" "50x250"
); );
ComboBox<String> dimensionsList = new ComboBox<String>(dimensions); ComboBox<String> dimensionsList = new ComboBox<>(dimensions);
dimensionsList.setPromptText("Select Dimensions"); dimensionsList.setPromptText("Select Dimensions");
dimensionsList.setId("inputDropDownBox"); dimensionsList.setId("inputDropDownBox");
dimensionsList.setEditable(true); dimensionsList.setEditable(true);
...@@ -91,7 +91,7 @@ public class InputPopUpWindow { ...@@ -91,7 +91,7 @@ public class InputPopUpWindow {
"3ex", "3ex",
"4ex" "4ex"
); );
ComboBox<String> sawsetList = new ComboBox<String>(sawset); ComboBox<String> sawsetList = new ComboBox<>(sawset);
sawsetList.setPromptText("Select Dimensions"); sawsetList.setPromptText("Select Dimensions");
sawsetList.setId("inputDropDownBox"); sawsetList.setId("inputDropDownBox");
sawsetList.setEditable(true); sawsetList.setEditable(true);
...@@ -107,10 +107,10 @@ public class InputPopUpWindow { ...@@ -107,10 +107,10 @@ public class InputPopUpWindow {
"18%", "18%",
"20%" "20%"
); );
ComboBox<String> moistureList = new ComboBox<String>(moistureGoal); ComboBox<String> moistureList = new ComboBox<>(moistureGoal);
moistureList.setPromptText("Select Dimensions"); moistureList.setPromptText("Select Dimensions");
moistureList.setId("inputDropDownBox"); moistureList.setId("inputDropDownBox");
moistureList.setEditable(true);; moistureList.setEditable(true);
// Bottom - start button // Bottom - start button
...@@ -122,7 +122,13 @@ public class InputPopUpWindow { ...@@ -122,7 +122,13 @@ public class InputPopUpWindow {
TREE_SPECIES = treeSpeciesList.getValue(); TREE_SPECIES = treeSpeciesList.getValue();
DIMENSIONS = dimensionsList.getValue(); DIMENSIONS = dimensionsList.getValue();
SAWSET = sawsetList.getValue(); SAWSET = sawsetList.getValue();
if(moistureList.getValue() != null && moistureList.getValue().contains("%"))
{
MOISTURE_GOAL = moistureList.getValue().replace("%","");
} else {
MOISTURE_GOAL = moistureList.getValue(); MOISTURE_GOAL = moistureList.getValue();
}
// If the input is null, sets the value to be empty // If the input is null, sets the value to be empty
if (treeSpeciesList.getValue() == null) { if (treeSpeciesList.getValue() == null) {
...@@ -168,8 +174,8 @@ public class InputPopUpWindow { ...@@ -168,8 +174,8 @@ public class InputPopUpWindow {
try { try {
getData(); //getData();
//loadSingleSeries(setInputParameters(false,false,false,false)); loadSingleSeries(setInputParameters());
//loadMultipleSeries(setInputParameters()); //loadMultipleSeries(setInputParameters());
//loadSingleSeries(); //loadSingleSeries();
//loadMultipleSeries(); //loadMultipleSeries();
......
target/classes/com/application/DB/DB.class
+ 0
− 0
View file @ 105b0b9e
No preview for this file type
target/classes/com/application/GUI/InputPopUpWindow.class
+ 0
− 0
View file @ 105b0b9e
No preview for this file type
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment