From 458907da11e92d34aac3337c36d3db4d6082a8ab Mon Sep 17 00:00:00 2001
From: "nicolas.franco" <nicolas.franco@etu.uca.fr>
Date: Fri, 20 Jan 2023 19:18:13 +0100
Subject: [PATCH] probleme capteur null

---
 src/launcher/Launch.java       |  5 ++---
 src/model/Capteur.java         | 35 ++--------------------------------
 src/model/CapteurAbstrait.java | 34 +++++++++++++++++++++++++++++++++
 src/model/CapteurVirtuel.java  |  3 ++-
 src/view/ThermostatView.java   | 11 ++---------
 5 files changed, 42 insertions(+), 46 deletions(-)

diff --git a/src/launcher/Launch.java b/src/launcher/Launch.java
index 08bf814..caef86d 100644
--- a/src/launcher/Launch.java
+++ b/src/launcher/Launch.java
@@ -29,8 +29,7 @@ public class Launch extends Application {
     @Override
     public void start(Stage primaryStage) throws IOException, InterruptedException {
         Capteur captor = new Capteur(1,"CapteurIncroyable", 15);
-
-        Stage thermostatStage = new Stage();
+        /*Stage thermostatStage = new Stage();
         CapteurView capteurView = new ImageCtrlView(captor,"view/Image.fxml","mon titre");
         ThermostatView thermostatView = new ThermostatView(captor,"view/Thermostat.fxml","mon titre");
 
@@ -48,7 +47,7 @@ public class Launch extends Application {
                 }
             }
         };
-        t.start();
+        t.start();*/
     }
 }
 
diff --git a/src/model/Capteur.java b/src/model/Capteur.java
index be6387c..b2126d1 100644
--- a/src/model/Capteur.java
+++ b/src/model/Capteur.java
@@ -8,39 +8,8 @@ import java.util.Random;
 
 public class Capteur extends CapteurAbstrait {
 
-    private int id;
-    private String nom;
-    private ObjectProperty<Double> temp = new SimpleObjectProperty<>();
-
-    public Capteur(int id, String nom, int pTemp){
-        this.id = id;
-        this.nom = nom;
-        temp.setValue((double)pTemp);
-    }
-
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getNom() {
-        return nom;
-    }
-
-    public void setNom(String nom) {
-        this.nom = nom;
-    }
-
-    public ObjectProperty<Double> getTemp() {
-        return temp;
-    }
-
-    public void setTemp(int pTemp) {
-        this.temp.set((double)pTemp);
+    public Capteur(int id, String nom, double pTemp){
+        super(id,nom,pTemp);
     }
 
     @Override
diff --git a/src/model/CapteurAbstrait.java b/src/model/CapteurAbstrait.java
index dd6791d..e406198 100644
--- a/src/model/CapteurAbstrait.java
+++ b/src/model/CapteurAbstrait.java
@@ -1,7 +1,41 @@
 package model;
 
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 
 public abstract class CapteurAbstrait {
+    private int id;
+    private String nom;
+    private ObjectProperty<Double> temp = new SimpleObjectProperty<>();
+
+    CapteurAbstrait(int id, String nom, Double temp){
+        this.id = id;
+        this.nom = nom;
+        this.temp.setValue(temp);
+    }
     public abstract ObjectProperty<Double> genTemp();
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getNom() {
+        return nom;
+    }
+
+    public void setNom(String nom) {
+        this.nom = nom;
+    }
+
+    public ObjectProperty<Double> getTemp() {
+        return temp;
+    }
+
+    public void setTemp(int pTemp) {
+        this.temp.set((double)pTemp);
+    }
 }
diff --git a/src/model/CapteurVirtuel.java b/src/model/CapteurVirtuel.java
index 813d020..adc4152 100644
--- a/src/model/CapteurVirtuel.java
+++ b/src/model/CapteurVirtuel.java
@@ -9,7 +9,8 @@ public class CapteurVirtuel extends CapteurAbstrait {
 
     private List<CapteurAbstrait> capteurs;
 
-    public CapteurVirtuel(List<CapteurAbstrait> cs){
+    CapteurVirtuel(List<CapteurAbstrait> cs, int id, String nom, Double temp){
+        super(id, nom, temp);
         this.capteurs = cs;
     }
     public void addCapteur(CapteurAbstrait c){
diff --git a/src/view/ThermostatView.java b/src/view/ThermostatView.java
index fe2f525..76bebce 100644
--- a/src/view/ThermostatView.java
+++ b/src/view/ThermostatView.java
@@ -1,14 +1,9 @@
 package view;
 
 import javafx.application.Platform;
-import javafx.beans.Observable;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
 import javafx.scene.control.Spinner;
 import javafx.scene.control.SpinnerValueFactory;
-import javafx.stage.Stage;
 import model.Capteur;
 
 import java.io.IOException;
@@ -23,16 +18,14 @@ public class ThermostatView extends CapteurView{
 
     public ThermostatView(Capteur capteur, String url, String title) throws IOException {
         super(capteur,url,title);
-        this.capteur = capteur;
         this.spin.setValueFactory(new SpinnerValueFactory.DoubleSpinnerValueFactory(0d,100d));
         this.spin.getValueFactory().valueProperty().bindBidirectional(this.capteur.getTemp());
         myBtn.setOnAction(e -> Platform.exit());
     }
 
     public void initialize() {
-        //SpinnerValueFactory valueFactory = new SpinnerValueFactory.IntegerSpinnerValueFactory(capteur.getTemp(), capteur.getTemp(), capteur.getTemp());
-        //spin.setValueFactory(valueFactory);
-
+        SpinnerValueFactory valueFactory = new SpinnerValueFactory.DoubleSpinnerValueFactory(capteur.getTemp().getValue(),capteur.getTemp().getValue(), capteur.getTemp().getValue());
+        spin.setValueFactory(valueFactory);
     }
 
 }