probleme capteur null

composite
Nicolas FRANCO 2 years ago
parent 80bcceb957
commit 458907da11

@ -29,8 +29,7 @@ public class Launch extends Application {
@Override @Override
public void start(Stage primaryStage) throws IOException, InterruptedException { public void start(Stage primaryStage) throws IOException, InterruptedException {
Capteur captor = new Capteur(1,"CapteurIncroyable", 15); 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"); CapteurView capteurView = new ImageCtrlView(captor,"view/Image.fxml","mon titre");
ThermostatView thermostatView = new ThermostatView(captor,"view/Thermostat.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();*/
} }
} }

@ -8,39 +8,8 @@ import java.util.Random;
public class Capteur extends CapteurAbstrait { public class Capteur extends CapteurAbstrait {
private int id; public Capteur(int id, String nom, double pTemp){
private String nom; super(id,nom,pTemp);
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);
} }
@Override @Override

@ -1,7 +1,41 @@
package model; package model;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
public abstract class CapteurAbstrait { 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 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);
}
} }

@ -9,7 +9,8 @@ public class CapteurVirtuel extends CapteurAbstrait {
private List<CapteurAbstrait> capteurs; 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; this.capteurs = cs;
} }
public void addCapteur(CapteurAbstrait c){ public void addCapteur(CapteurAbstrait c){

@ -1,14 +1,9 @@
package view; package view;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.Observable;
import javafx.fxml.FXML; 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.Spinner;
import javafx.scene.control.SpinnerValueFactory; import javafx.scene.control.SpinnerValueFactory;
import javafx.stage.Stage;
import model.Capteur; import model.Capteur;
import java.io.IOException; import java.io.IOException;
@ -23,16 +18,14 @@ public class ThermostatView extends CapteurView{
public ThermostatView(Capteur capteur, String url, String title) throws IOException { public ThermostatView(Capteur capteur, String url, String title) throws IOException {
super(capteur,url,title); super(capteur,url,title);
this.capteur = capteur;
this.spin.setValueFactory(new SpinnerValueFactory.DoubleSpinnerValueFactory(0d,100d)); this.spin.setValueFactory(new SpinnerValueFactory.DoubleSpinnerValueFactory(0d,100d));
this.spin.getValueFactory().valueProperty().bindBidirectional(this.capteur.getTemp()); this.spin.getValueFactory().valueProperty().bindBidirectional(this.capteur.getTemp());
myBtn.setOnAction(e -> Platform.exit()); myBtn.setOnAction(e -> Platform.exit());
} }
public void initialize() { public void initialize() {
//SpinnerValueFactory valueFactory = new SpinnerValueFactory.IntegerSpinnerValueFactory(capteur.getTemp(), capteur.getTemp(), capteur.getTemp()); SpinnerValueFactory valueFactory = new SpinnerValueFactory.DoubleSpinnerValueFactory(capteur.getTemp().getValue(),capteur.getTemp().getValue(), capteur.getTemp().getValue());
//spin.setValueFactory(valueFactory); spin.setValueFactory(valueFactory);
} }
} }

Loading…
Cancel
Save