From 32dcca80dfd8b539a429d38731287e0f7848bad8 Mon Sep 17 00:00:00 2001
From: aed10006 <aimee.dipietro@uconn.edu>
Date: Fri, 1 May 2015 14:04:52 -0400
Subject: [PATCH] Moved timmer

---
 bin/InputOutput/InputOutput.class             | Bin 3249 -> 3249 bytes
 bin/interface_xml_files/Thermocontroller.fxml |  11 +++------
 bin/testing/Networking_Test.class             | Bin 479 -> 479 bytes
 bin/testing/TestforIO.class                   | Bin 327 -> 327 bytes
 bin/testing/ThermostatTest.class              | Bin 2672 -> 2672 bytes
 bin/thermostat/Sensorable.class               | Bin 293 -> 293 bytes
 bin/thermostat/TemperatureSensor.class        | Bin 1241 -> 1241 bytes
 bin/thermostat/ThermostatDevice.class         | Bin 4558 -> 4558 bytes
 src/InputOutput/Thermocontroller.java         |  21 +++++++-----------
 src/interface_xml_files/Thermocontroller.fxml |  11 +++------
 10 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/bin/InputOutput/InputOutput.class b/bin/InputOutput/InputOutput.class
index a41adec1494baa0dc3c57b2afa4ffe72e3e29586..aab24998fc7d46ffe07b51ce81748702b5dccfba 100644
GIT binary patch
delta 17
Zcmdlexlxki)W2Q(7#J8#Hgc@w0RTZ627dqm

delta 17
Zcmdlexlxki)W2Q(7#J9gH*&1x0RTZ127Ukl

diff --git a/bin/interface_xml_files/Thermocontroller.fxml b/bin/interface_xml_files/Thermocontroller.fxml
index 2256545..e47f63e 100644
--- a/bin/interface_xml_files/Thermocontroller.fxml
+++ b/bin/interface_xml_files/Thermocontroller.fxml
@@ -12,12 +12,12 @@
             <Font name="Helvetica Neue Light" size="50.0" />
          </font>
       </Label>
-      <Label fx:id="temp" layoutX="268.0" layoutY="134.0" text="73 ˚F" AnchorPane.bottomAnchor="66.0">
+      <Label fx:id="temp" layoutX="251.0" layoutY="132.0" text="73 ˚F" AnchorPane.bottomAnchor="92.0">
          <font>
             <Font name="Helvetica Neue" size="13.0" />
          </font>
       </Label>
-      <Slider fx:id="slider" layoutX="112.0" layoutY="133.0" max="85.0" min="50.0" prefHeight="16.0" prefWidth="133.0" value="69.0" AnchorPane.bottomAnchor="67.0" />
+      <Slider fx:id="slider" layoutX="104.0" layoutY="133.0" max="85.0" min="50.0" prefHeight="16.0" prefWidth="133.0" value="69.0" AnchorPane.bottomAnchor="94.0" />
       <Separator layoutX="81.0" layoutY="181.0" prefWidth="200.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" />
       <Label layoutX="104.0" layoutY="184.0" text="System Mode: " AnchorPane.bottomAnchor="10.0">
          <font>
@@ -30,11 +30,6 @@
          </font>
       </Label>
       <Separator layoutX="21.0" layoutY="107.0" prefHeight="3.0" prefWidth="299.0" />
-      <TextField layoutX="165.0" layoutY="109.0" />
-      <Label fx:id="thermostatLabel" layoutX="38.0" layoutY="112.0" text="Thermostat Name:">
-         <font>
-            <Font size="14.0" />
-         </font>
-      </Label>
    </children>
 </AnchorPane>
+
diff --git a/bin/testing/Networking_Test.class b/bin/testing/Networking_Test.class
index c8e8db675d9eb5ea07abdfeca4526df8282bb3ac..7263198dafb400362112b39b4a18f2301029705c 100644
GIT binary patch
delta 17
Zcmcc5e4m-))W2Q(7#J8#Hga5N1OP;q2GRfk

delta 17
Zcmcc5e4m-))W2Q(7#J9gH*#EO1OP;l2GIZj

diff --git a/bin/testing/TestforIO.class b/bin/testing/TestforIO.class
index e26a3a5941ef99d7c13b65a2ac4d081dd82fa1ae..6e069f9113045fe5e8add129ac28d1779b874ac4 100644
GIT binary patch
delta 17
ZcmX@kbexIf)W2Q(7#J8#HgecA0sufr1_%HE

delta 17
ZcmX@kbexIf)W2Q(7#J9gH*(lB0sufm1_uBD

diff --git a/bin/testing/ThermostatTest.class b/bin/testing/ThermostatTest.class
index 8e323b5e4504a87e5543319b2b1a21370c62b76e..a7aa829a0b90b5ed2199f3820b5c3cf23945ceec 100644
GIT binary patch
delta 17
Zcmew$@<D{-)W2Q(7#J8#HgaTe0RTte2Cx7C

delta 17
Zcmew$@<D{-)W2Q(7#J9gH*#cf0RTtZ2Co1B

diff --git a/bin/thermostat/Sensorable.class b/bin/thermostat/Sensorable.class
index 37dff21e464afddfc8653a759f30468f5e7e1c0c..58a0d2df1710228c50525fe3ebf025433a8618d3 100644
GIT binary patch
delta 17
ZcmZ3=w3LbC)W2Q(7#J8#Hgd=^0suS21)=}|

delta 17
ZcmZ3=w3LbC)W2Q(7#J9gH*&}_0suR|1)%@{

diff --git a/bin/thermostat/TemperatureSensor.class b/bin/thermostat/TemperatureSensor.class
index b5ee7310bf2f59bd44787f3af831e6e850652409..5a6eafd48f5c1c3945b4bfd55ed7670b580eeb64 100644
GIT binary patch
delta 17
Zcmcb~d6Sdl)W2Q(7#J8#Hga5K0RTjS2G0Nh

delta 17
Zcmcb~d6Sdl)W2Q(7#J9gH*#EL0RTjN2F?Hg

diff --git a/bin/thermostat/ThermostatDevice.class b/bin/thermostat/ThermostatDevice.class
index 9836434ab26363082bd39e4eb68e68b1837d804a..5037b93bae7cd5ffff73291e3b3da2b6028fae1f 100644
GIT binary patch
delta 29
lcmX@7d`?;5)W2Q(7#J8#7~ZopFflSnPd>;ky-|CyAONAH355Uv

delta 29
lcmX@7d`?;5)W2Q(7#J9g8Q!xqFflSnPd>;ky-|CyAONA034{Ou

diff --git a/src/InputOutput/Thermocontroller.java b/src/InputOutput/Thermocontroller.java
index 31861a1..4e826cf 100644
--- a/src/InputOutput/Thermocontroller.java
+++ b/src/InputOutput/Thermocontroller.java
@@ -24,7 +24,6 @@
 public class Thermocontroller implements Initializable{
 	
 	public boolean slide = false;
-	public String _enteredSerial;
 	server _server;
 	Timer _timer;
 
@@ -40,9 +39,6 @@ public class Thermocontroller implements Initializable{
 	@FXML
 	private Label temp;
 	
-	@FXML 
-	private TextField thermostatName;
-	
 	@FXML
 	private Label heating;
 	@Override
@@ -54,8 +50,6 @@ public void initialize(URL arg0, ResourceBundle arg1) {
 			public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
 				System.out.println("Sliding");
 				slide = true;
-				_enteredSerial = thermostatName.getText();
-				_server.setDesiredTempForSerialNumber(_enteredSerial, Double.toString(slider.getValue()));
 				temp.setText(newValue.intValue() + "");
 				if (slider.getValue() <= 60.0){
 					heating.setText("cooling");
@@ -65,15 +59,16 @@ public void changed(ObservableValue<? extends Number> observable, Number oldValu
 					heating.setText("heating");
 					heating.setTextFill(Color.RED);
 				}
-				_timer = new Timer();
-				_timer.schedule(new TimerTask() {
-					public void run() {
-						String currentTempFromServer = _server.getCurrentTempFromSerialNumber(_enteredSerial);
-						currentTemp.setText(currentTempFromServer);
-					}
-				}, 90*10000, 90*1000);
+				
 			}
 		});
+		_timer = new Timer();
+		_timer.schedule(new TimerTask() {
+			public void run() {	
+				currentTemp.setText("");
+				System.out.println("temp changed");
+			}
+		}, 90*10, 90*10);
 	}
 	
 	public boolean getSlide(){
diff --git a/src/interface_xml_files/Thermocontroller.fxml b/src/interface_xml_files/Thermocontroller.fxml
index 2256545..e47f63e 100644
--- a/src/interface_xml_files/Thermocontroller.fxml
+++ b/src/interface_xml_files/Thermocontroller.fxml
@@ -12,12 +12,12 @@
             <Font name="Helvetica Neue Light" size="50.0" />
          </font>
       </Label>
-      <Label fx:id="temp" layoutX="268.0" layoutY="134.0" text="73 ˚F" AnchorPane.bottomAnchor="66.0">
+      <Label fx:id="temp" layoutX="251.0" layoutY="132.0" text="73 ˚F" AnchorPane.bottomAnchor="92.0">
          <font>
             <Font name="Helvetica Neue" size="13.0" />
          </font>
       </Label>
-      <Slider fx:id="slider" layoutX="112.0" layoutY="133.0" max="85.0" min="50.0" prefHeight="16.0" prefWidth="133.0" value="69.0" AnchorPane.bottomAnchor="67.0" />
+      <Slider fx:id="slider" layoutX="104.0" layoutY="133.0" max="85.0" min="50.0" prefHeight="16.0" prefWidth="133.0" value="69.0" AnchorPane.bottomAnchor="94.0" />
       <Separator layoutX="81.0" layoutY="181.0" prefWidth="200.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" />
       <Label layoutX="104.0" layoutY="184.0" text="System Mode: " AnchorPane.bottomAnchor="10.0">
          <font>
@@ -30,11 +30,6 @@
          </font>
       </Label>
       <Separator layoutX="21.0" layoutY="107.0" prefHeight="3.0" prefWidth="299.0" />
-      <TextField layoutX="165.0" layoutY="109.0" />
-      <Label fx:id="thermostatLabel" layoutX="38.0" layoutY="112.0" text="Thermostat Name:">
-         <font>
-            <Font size="14.0" />
-         </font>
-      </Label>
    </children>
 </AnchorPane>
+