diff --git a/src/InputOutput/Thermocontroller.java b/src/InputOutput/Thermocontroller.java index 4e826cf..d734f63 100644 --- a/src/InputOutput/Thermocontroller.java +++ b/src/InputOutput/Thermocontroller.java @@ -10,6 +10,8 @@ import java.util.Timer; import java.util.TimerTask; +import javax.swing.SwingUtilities; + import testing.UITest; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; @@ -26,6 +28,8 @@ public class Thermocontroller implements Initializable{ public boolean slide = false; server _server; Timer _timer; + String _serial; + UserLogin _userLogin = new UserLogin(); @FXML private Slider slider; @@ -44,6 +48,8 @@ public class Thermocontroller implements Initializable{ @Override public void initialize(URL arg0, ResourceBundle arg1) { _server = server.getInstance(); + _serial = _server.getDevicesFromEmail(_userLogin.getEmail()); + System.out.println(_serial); this.slider.valueProperty().addListener(new ChangeListener() { @Override //Slider action, changes text color and message, displays disired temp @@ -63,13 +69,21 @@ public void changed(ObservableValue observable, Number oldValu } }); _timer = new Timer(); - _timer.schedule(new TimerTask() { - public void run() { - currentTemp.setText(""); - System.out.println("temp changed"); - } - }, 90*10, 90*10); - } + _timer.scheduleAtFixedRate(new TimerTask() { + @Override + public void run() { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run(){ + _server.getCurrentTempFromSerialNumber(_serial); + System.out.println("temp changed"); + } + + }); + } + }, 0, 2000); +} + public boolean getSlide(){ return slide; diff --git a/src/InputOutput/UserLogin.java b/src/InputOutput/UserLogin.java index c7dcfe3..2914064 100644 --- a/src/InputOutput/UserLogin.java +++ b/src/InputOutput/UserLogin.java @@ -72,6 +72,7 @@ public void handle(ActionEvent e) { } else { if (enteredEmail.equals(queriedEmail) && enteredPassword.equals(queriedPassword)){ _loggedin = true; + _email = queriedEmail; try{//opens new window when login true Parent root = FXMLLoader.load(getClass().getResource("/interface_xml_files/Thermocontroller.fxml")); Stage stage = new Stage();