From 3b6918ed7625a0d9fdbd043281f12f320329bfcc Mon Sep 17 00:00:00 2001
From: clfreville2 <clement.freville2@etu.uca.fr>
Date: Sun, 22 Jan 2023 21:29:23 +0100
Subject: [PATCH] Tweak the sensor display

---
 src/fr/uca/iut/clfreville2/gui/MainWindows.java                 | 1 +
 src/fr/uca/iut/clfreville2/gui/ModalFactory.java                | 2 +-
 src/fr/uca/iut/clfreville2/gui/image/StandardImageSupplier.java | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/fr/uca/iut/clfreville2/gui/MainWindows.java b/src/fr/uca/iut/clfreville2/gui/MainWindows.java
index 4a4d963..390c45b 100644
--- a/src/fr/uca/iut/clfreville2/gui/MainWindows.java
+++ b/src/fr/uca/iut/clfreville2/gui/MainWindows.java
@@ -169,6 +169,7 @@ public class MainWindows {
         sensorTree.getSelectionModel().selectedItemProperty().addListener((list, oldValue, newValue) -> {
             if (oldValue != null && oldValue.getValue() != null) {
                 sensorName.textProperty().unbindBidirectional(oldValue.getValue().nameProperty());
+                sensorName.setText(null);
                 sourcesView.itemsProperty().unbind();
                 sourcesView.setItems(FXCollections.emptyObservableList());
                 if (oldValue.getValue() instanceof AutoSensor auto) {
diff --git a/src/fr/uca/iut/clfreville2/gui/ModalFactory.java b/src/fr/uca/iut/clfreville2/gui/ModalFactory.java
index af1c7e1..db2dadd 100644
--- a/src/fr/uca/iut/clfreville2/gui/ModalFactory.java
+++ b/src/fr/uca/iut/clfreville2/gui/ModalFactory.java
@@ -36,7 +36,7 @@ public class ModalFactory {
     public Stage createModal(Sensor sensor, Consumer<Pane> initializer) {
         return createModal(root -> {
             Text name = new Text();
-            name.textProperty().bind(sensor.displayNameExpression().concat(sensor.temperatureProperty().asString(" (%s°C)")));
+            name.textProperty().bind(sensor.displayNameExpression().concat(sensor.temperatureProperty().asString(" (%.1f°C)")));
             root.getChildren().add(name);
             initializer.accept(root);
         });
diff --git a/src/fr/uca/iut/clfreville2/gui/image/StandardImageSupplier.java b/src/fr/uca/iut/clfreville2/gui/image/StandardImageSupplier.java
index 1b6f2ae..8b66c33 100644
--- a/src/fr/uca/iut/clfreville2/gui/image/StandardImageSupplier.java
+++ b/src/fr/uca/iut/clfreville2/gui/image/StandardImageSupplier.java
@@ -5,7 +5,7 @@ import javafx.scene.image.Image;
 
 public class StandardImageSupplier implements ImageSupplier {
     private static final int HOT_THRESHOLD = 22;
-    private static final int WARM_THRESHOLD = 10;
+    private static final int WARM_THRESHOLD = 0;
 
     private final Image hotImage;
     private final Image warmImage;