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

Started working on the input popup window

parent 82f24126
No related branches found
No related tags found
No related merge requests found
...@@ -29,6 +29,7 @@ public final class Constants { ...@@ -29,6 +29,7 @@ public final class Constants {
public static final String PROJECT_ID = "sf-drying-optimization"; public static final String PROJECT_ID = "sf-drying-optimization";
/*
// Location Valasen(124) // Location Valasen(124)
// Project settings // Project settings
public static final int LOCATION_ID = 124; public static final int LOCATION_ID = 124;
...@@ -50,10 +51,12 @@ public final class Constants { ...@@ -50,10 +51,12 @@ public final class Constants {
public static final int VALUE_ID = 51; public static final int VALUE_ID = 51;
public static final int LIMIT = 1000; public static final int LIMIT = 1000;
*/
/*
// Location Arjang(174) // Location Arjang(174)
// Project settings // Project settings
public static final int LOCATION_ID = 174; public static final int LOCATION_ID = 174;
...@@ -66,7 +69,8 @@ public final class Constants { ...@@ -66,7 +69,8 @@ public final class Constants {
public static final String START_DRYING_NAME = "DryingStarted"; public static final String START_DRYING_NAME = "DryingStarted";
public static final String STOP_DRYING_NAME = "DryingCompleted"; public static final String STOP_DRYING_NAME = "DryingCompleted";
public static final String KILIN_NAME = "KilinId"; public static final String KILIN_NAME = "KilinId";
public static int KILIN_ID = 17; //public static int KILIN_ID = 18;
public static int KILIN_ID = 18133;
// Swappconsensordata // Swappconsensordata
public static final String KWH_NAME = "RealValue"; public static final String KWH_NAME = "RealValue";
...@@ -75,8 +79,6 @@ public final class Constants { ...@@ -75,8 +79,6 @@ public final class Constants {
public static final int VALUE_ID = 19; public static final int VALUE_ID = 19;
public static final int LIMIT = 1000; public static final int LIMIT = 1000;
*/
......
...@@ -6,10 +6,7 @@ import com.google.cloud.bigquery.*; ...@@ -6,10 +6,7 @@ import com.google.cloud.bigquery.*;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
...@@ -279,6 +276,7 @@ public class DB { ...@@ -279,6 +276,7 @@ public class DB {
extraInputParameter += "AND CalculatedStart BETWEEN \"1990-01-01 00:00:00\" AND \"" + TODAYS_DATE + "\" "; extraInputParameter += "AND CalculatedStart BETWEEN \"1990-01-01 00:00:00\" AND \"" + TODAYS_DATE + "\" ";
} }
if(LOCATION_ID == 174){ if(LOCATION_ID == 174){
// KILIN_ID starts at 0 not 1 in the database.
KILIN_ID -= 1; KILIN_ID -= 1;
} }
......
package com.application.GUI;
import javafx.geometry.Pos;
import javafx.scene.*;
import javafx.scene.control.*;
import javafx.scene.layout.*;
import javafx.stage.*;
/**
* This class handles the popup input window
*/
public class Input {
public static void display()
{
Stage popupwindow=new Stage();
popupwindow.initModality(Modality.APPLICATION_MODAL);
popupwindow.setTitle("Input Parameters");
Label inputLabel= new Label("Input");
inputLabel.setAlignment(Pos.TOP_CENTER);
Button close= new Button("Close this pop up window");
close.setAlignment(Pos.BOTTOM_CENTER);
close.setOnAction(e -> popupwindow.close());
BorderPane layout= new BorderPane();
//layout.set(inputLabel);
//layout.setCenter();
//layout.setBottom(close);
layout.getChildren().addAll(inputLabel, close);
Scene scene1= new Scene(layout, 300, 250);
popupwindow.setScene(scene1);
popupwindow.showAndWait();
}
}
package com.application; package com.application;
import com.application.DB.DB; import com.application.DB.DB;
import com.application.GUI.Input;
import com.application.GUI.RingProgressIndicator; import com.application.GUI.RingProgressIndicator;
import com.sun.corba.se.spi.orbutil.threadpool.Work;
import javafx.application.Application; import javafx.application.Application;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.scene.chart.LineChart; import javafx.scene.chart.LineChart;
...@@ -133,6 +133,7 @@ public class Main extends Application { ...@@ -133,6 +133,7 @@ public class Main extends Application {
Menu menuEdit = new Menu("Edit"); Menu menuEdit = new Menu("Edit");
Menu menuHelp = new Menu("Help"); Menu menuHelp = new Menu("Help");
// Adding the menus to the menubar // Adding the menus to the menubar
menuBar.getMenus().add(menuFile); menuBar.getMenus().add(menuFile);
menuBar.getMenus().add(menuEdit); menuBar.getMenus().add(menuEdit);
...@@ -155,6 +156,7 @@ public class Main extends Application { ...@@ -155,6 +156,7 @@ public class Main extends Application {
TextField treeSpeciesText = new TextField(); TextField treeSpeciesText = new TextField();
treeSpeciesText.setId("sideBarLabelText"); treeSpeciesText.setId("sideBarLabelText");
treeSpeciesText.setPromptText("Bjørk"); treeSpeciesText.setPromptText("Bjørk");
treeSpeciesText.getText();
Label dimensionsLabel = new Label("Width x Height"); Label dimensionsLabel = new Label("Width x Height");
dimensionsLabel.setId("sideBarLabelText"); dimensionsLabel.setId("sideBarLabelText");
...@@ -176,6 +178,7 @@ public class Main extends Application { ...@@ -176,6 +178,7 @@ public class Main extends Application {
Button finish = new Button("Finish"); Button finish = new Button("Finish");
finish.setId("sideBarButtonFinish"); finish.setId("sideBarButtonFinish");
finish.setOnAction(e -> Input.display());
// Creating the circular progressbar // Creating the circular progressbar
RingProgressIndicator ringProgressIndicator = new RingProgressIndicator(); RingProgressIndicator ringProgressIndicator = new RingProgressIndicator();
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment