diff --git a/src/.DS_Store b/src/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ed78902e5674c5d9579d67d7226e0bc948e27d97
Binary files /dev/null and b/src/.DS_Store differ
diff --git a/src/main/.DS_Store b/src/main/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..781a3c655962fe52d703183661c8e76fdcdfe6fc
Binary files /dev/null and b/src/main/.DS_Store differ
diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..176977a9dce9badd7dddb7f4a5b3163c276e2596
Binary files /dev/null and b/src/main/java/.DS_Store differ
diff --git a/src/main/java/fr/.DS_Store b/src/main/java/fr/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..313e051e03f04b80cee7f7c53f3c5ab2dbf054fe
Binary files /dev/null and b/src/main/java/fr/.DS_Store differ
diff --git a/src/main/java/fr/univlille/.DS_Store b/src/main/java/fr/univlille/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..4c50c0dee61d2789a9dc7b235f98ce25c3f0623c
Binary files /dev/null and b/src/main/java/fr/univlille/.DS_Store differ
diff --git a/src/main/java/fr/univlille/iut/.DS_Store b/src/main/java/fr/univlille/iut/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..d94af2a06c1dd51bbb91b3202a38f0de73892760
Binary files /dev/null and b/src/main/java/fr/univlille/iut/.DS_Store differ
diff --git a/src/main/java/fr/univlille/iut/r304/.DS_Store b/src/main/java/fr/univlille/iut/r304/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b08bdb2b15cff6c1228a18c76380f3fce68ca780
Binary files /dev/null and b/src/main/java/fr/univlille/iut/r304/.DS_Store differ
diff --git a/src/main/java/fr/univlille/iut/r304/thermo/.DS_Store b/src/main/java/fr/univlille/iut/r304/thermo/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..dd24d141494636e06003ff9953b2ba4d9fa8e159
Binary files /dev/null and b/src/main/java/fr/univlille/iut/r304/thermo/.DS_Store differ
diff --git a/src/main/java/fr/univlille/iut/r304/thermo/Main.java b/src/main/java/fr/univlille/iut/r304/thermo/Main.java
index 9ab0f10c6f1bcbd671d681229e4934137cea4279..1173972f20cb7266abbdf0a92958903c42454aa0 100644
--- a/src/main/java/fr/univlille/iut/r304/thermo/Main.java
+++ b/src/main/java/fr/univlille/iut/r304/thermo/Main.java
@@ -3,7 +3,15 @@ package fr.univlille.iut.r304.thermo;
import fr.univlille.iut.r304.thermo.model.Thermostat;
import fr.univlille.iut.r304.thermo.view.TextView;
import javafx.application.Application;
+import javafx.geometry.Pos;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.Slider;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
import javafx.stage.Stage;
+import javafx.scene.control.Label;
public class Main extends Application {
@@ -14,7 +22,75 @@ public class Main extends Application {
@Override
public void start(Stage primaryStage) throws Exception {
Thermostat thermo = new Thermostat();
- new TextView(thermo);
+ TextView view = new TextView(thermo);
+ Label l = new Label("Température en Celcius");
+ thermo.getTemperature();
+
+ Button b1 = new Button(" - ");
+ Button b2 = new Button(" + ");
+ Button b3 = new Button(" - ");
+ Button b4 = new Button(" + ");
+ TextField tf = new TextField("0.0");
+
+ Slider s = new Slider(-10, 50, 0.5);
+ s.setRotate(90);
+ s.setShowTickMarks(true);
+ s.setShowTickLabels(true);
+
+ tf.setAlignment(Pos.CENTER);
+
+ b1.setOnAction(e ->{
+ tf.setText(String.valueOf(Double.parseDouble(tf.getText())-1.0));
+ });
+
+ b2.setOnAction(e ->{
+ tf.setText(String.valueOf(Double.parseDouble(tf.getText())+1.0));
+ });
+
+ b3.setOnAction(e ->{
+ tf.setText(String.valueOf(Double.parseDouble(tf.getText())-1.0));
+ s.setValue(s.getValue()-1.0);
+ });
+
+ b4.setOnAction(e ->{
+ tf.setText(String.valueOf(Double.parseDouble(tf.getText())+1.0));
+ s.setValue(s.getValue()+1.0);
+ });
+
+ s.setOnMouseClicked(e ->{
+ tf.setText(String.valueOf(Math.round(s.getValue() * 10) / 10.0));
+ });
+
+ tf.setOnAction(e ->{
+ s.setValue(Double.parseDouble(tf.getText()));
+ });
+
+ VBox vbox2 = new VBox();
+ vbox2.setAlignment(Pos.CENTER);
+ vbox2.setSpacing(50);
+ vbox2.getChildren().addAll(b3,s,b4);
+
+ HBox hbox = new HBox();
+ hbox.setSpacing(10);
+ hbox.setAlignment(Pos.CENTER);
+ hbox.getChildren().addAll(b1,tf,b2);
+
+ VBox vbox = new VBox();
+ vbox.setAlignment(Pos.CENTER);
+ vbox.getChildren().addAll(l, hbox);
+
+ primaryStage.setTitle("Thermostat");
+ primaryStage.setScene(new Scene(vbox2));
+ primaryStage.setMinWidth(100);
+ primaryStage.setMinHeight(400);
+
+ view.setMinHeight(100);
+ view.setMinWidth(100);
+
+ Scene scene = new Scene(vbox);
+ view.setScene(scene);
+ view.show();
+ primaryStage.show();
}
}
diff --git a/src/main/java/fr/univlille/iut/r304/thermo/model/Thermostat.java b/src/main/java/fr/univlille/iut/r304/thermo/model/Thermostat.java
index 9d86f764c0563d05a0e479f4ddbe891165ad9758..2661f0dcdcff965061472b6874f406ab12908690 100644
--- a/src/main/java/fr/univlille/iut/r304/thermo/model/Thermostat.java
+++ b/src/main/java/fr/univlille/iut/r304/thermo/model/Thermostat.java
@@ -2,27 +2,27 @@ package fr.univlille.iut.r304.thermo.model;
public class Thermostat implements ITemperature {
+ private Double temperature;
+
@Override
- public void setTemperature(double d) {
- // TODO Auto-generated method stub
-
+ public void setTemperature(double d){
+ this.temperature = d;
}
@Override
public Double getTemperature() {
- // TODO Auto-generated method stub
- return null;
+ return this.temperature;
}
@Override
public void incrementTemperature() {
- // TODO Auto-generated method stub
+ this.temperature += 1;
}
@Override
public void decrementTemperature() {
- // TODO Auto-generated method stub
+ this.temperature -= 1;
}
diff --git a/src/main/java/fr/univlille/iut/r304/thermo/view/TextView.java b/src/main/java/fr/univlille/iut/r304/thermo/view/TextView.java
index 4faa759f6764a99144422ba1e6c9d45da0a15810..27009a2260a5481daa1b8d1dd46527e5d5621dd8 100644
--- a/src/main/java/fr/univlille/iut/r304/thermo/view/TextView.java
+++ b/src/main/java/fr/univlille/iut/r304/thermo/view/TextView.java
@@ -5,28 +5,28 @@ import javafx.stage.Stage;
public class TextView extends Stage implements ITemperatureView {
+ private Thermostat model;
+
public TextView(Thermostat model) {
//simplement pour avoir qqch qui s'affiche à la prise en main du dépôt
+ this.model = model;
this.setTitle("Thermostat");
this.show();
}
@Override
public double getDisplayedValue() {
- // TODO Auto-generated method stub
- return 0;
+ return this.model.getTemperature();
}
@Override
public void incrementAction() {
- // TODO Auto-generated method stub
-
+ model.incrementTemperature();
}
@Override
public void decrementAction() {
- // TODO Auto-generated method stub
-
+ model.decrementTemperature();
}
}