From a38ac2e3b3af32dca582e474ae6c6622693b4ca9 Mon Sep 17 00:00:00 2001
From: Bastien Cortequisse <bastien.cortequisse.etu@univ-lille.fr>
Date: Fri, 25 Sep 2020 10:58:05 +0200
Subject: [PATCH] Premier affichage
---
pom.xml | 2 +-
.../java/fr/univlille/iutinfo/m3105/Main.java | 10 ++++-
.../m3105/modelQ1/Thermogeekostat.java | 10 ++---
.../iutinfo/m3105/viewQ1/TextView.java | 37 +++++++++++++++++--
4 files changed, 48 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index f40b84e..ce6086c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.4</version>
<configuration>
- <mainClass>fr.univlille.iutinfo.m3105.JavaFXSimpleExample</mainClass>
+ <mainClass>fr.univlille.iutinfo.m3105.Main</mainClass>
</configuration>
</plugin>
</plugins>
diff --git a/src/main/java/fr/univlille/iutinfo/m3105/Main.java b/src/main/java/fr/univlille/iutinfo/m3105/Main.java
index dd6206a..4d20c6c 100644
--- a/src/main/java/fr/univlille/iutinfo/m3105/Main.java
+++ b/src/main/java/fr/univlille/iutinfo/m3105/Main.java
@@ -3,6 +3,8 @@ package fr.univlille.iutinfo.m3105;
import fr.univlille.iutinfo.m3105.modelQ1.Thermogeekostat;
import fr.univlille.iutinfo.m3105.viewQ1.TextView;
import javafx.application.Application;
+import javafx.scene.Scene;
+import javafx.scene.layout.HBox;
import javafx.stage.Stage;
public class Main extends Application {
@@ -14,7 +16,13 @@ public class Main extends Application {
@Override
public void start(Stage primaryStage) throws Exception {
Thermogeekostat thermo = new Thermogeekostat();
- new TextView( thermo);
+ thermo.setTemperature(0);
+ TextView txt=new TextView(thermo);
+
+ Scene scene = new Scene(new HBox(txt.getBoite()));
+ primaryStage.setTitle("Super Thermostat");
+ primaryStage.setScene(scene);
+ primaryStage.show();
}
}
diff --git a/src/main/java/fr/univlille/iutinfo/m3105/modelQ1/Thermogeekostat.java b/src/main/java/fr/univlille/iutinfo/m3105/modelQ1/Thermogeekostat.java
index 039817a..2dc52a0 100644
--- a/src/main/java/fr/univlille/iutinfo/m3105/modelQ1/Thermogeekostat.java
+++ b/src/main/java/fr/univlille/iutinfo/m3105/modelQ1/Thermogeekostat.java
@@ -1,29 +1,29 @@
package fr.univlille.iutinfo.m3105.modelQ1;
public class Thermogeekostat implements ITemperature {
-
+ private double temperature;
@Override
public void setTemperature(double d) {
// TODO Auto-generated method stub
-
+ 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.setTemperature(this.getTemperature()+1);
}
@Override
public void decrementTemperature() {
// TODO Auto-generated method stub
-
+ this.setTemperature(this.getTemperature()-1);
}
}
diff --git a/src/main/java/fr/univlille/iutinfo/m3105/viewQ1/TextView.java b/src/main/java/fr/univlille/iutinfo/m3105/viewQ1/TextView.java
index 5143810..c8ecadc 100644
--- a/src/main/java/fr/univlille/iutinfo/m3105/viewQ1/TextView.java
+++ b/src/main/java/fr/univlille/iutinfo/m3105/viewQ1/TextView.java
@@ -1,30 +1,59 @@
package fr.univlille.iutinfo.m3105.viewQ1;
import fr.univlille.iutinfo.m3105.modelQ1.Thermogeekostat;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
import javafx.stage.Stage;
public class TextView extends Stage implements ITemperatureView {
-
+ private Thermogeekostat model;
+ private Label l;
+ private Button plus, moins;
+ private HBox boite;
+
public TextView(Thermogeekostat model) {
// TODO Auto-generated constructor stub
+ this.model=model;
+ this.l=new Label(""+this.model.getTemperature());
+
+ this.plus=new Button("+");
+ plus.setOnAction(e ->{
+ this.incrementAction();
+ });
+
+ this.moins=new Button("-");
+ moins.setOnAction(e ->{
+ this.decrementAction();
+ });
+
+ this.boite=new HBox(this.moins,this.l,this.plus);
+
}
@Override
public double getDisplayedValue() {
// TODO Auto-generated method stub
- return 0;
+ return this.model.getTemperature();
}
@Override
public void incrementAction() {
// TODO Auto-generated method stub
-
+ this.model.incrementTemperature();
+ this.l.setText(""+this.getDisplayedValue());
}
@Override
public void decrementAction() {
// TODO Auto-generated method stub
-
+ this.model.decrementTemperature();
+ this.l.setText(""+this.getDisplayedValue());
+ }
+
+ public HBox getBoite() {
+ return this.boite;
}
+
}
--
GitLab