From 2f54869d62000388bc74493bdf7e495431d677b6 Mon Sep 17 00:00:00 2001
From: Nicolas FRANCO <Nicolas.FRANCO@etu.uca.fr>
Date: Tue, 17 Jan 2023 19:17:13 +0100
Subject: [PATCH] resetup project

---
 .idea/.gitignore               |  3 +++
 .idea/misc.xml                 |  6 ++++++
 .idea/modules.xml              |  8 ++++++++
 .idea/vcs.xml                  |  6 ++++++
 TP_JavaFX.iml                  | 12 ++++++++++++
 src/model/Capteur.java         |  2 +-
 src/model/CapteurAbstrait.java |  4 ++--
 src/model/CapteurVirtuel.java  |  6 +++---
 8 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 TP_JavaFX.iml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..478cad1
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="18 (2)" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..0e8cb46
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/TP_JavaFX.iml" filepath="$PROJECT_DIR$/TP_JavaFX.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/TP_JavaFX.iml b/TP_JavaFX.iml
new file mode 100644
index 0000000..fb8e866
--- /dev/null
+++ b/TP_JavaFX.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="lib" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/model/Capteur.java b/src/model/Capteur.java
index e573844..be6387c 100644
--- a/src/model/Capteur.java
+++ b/src/model/Capteur.java
@@ -6,7 +6,7 @@ import javafx.beans.property.SimpleObjectProperty;
 
 import java.util.Random;
 
-public class Capteur implements CapteurAbstrait{
+public class Capteur extends CapteurAbstrait {
 
     private int id;
     private String nom;
diff --git a/src/model/CapteurAbstrait.java b/src/model/CapteurAbstrait.java
index e2d33fb..dd6791d 100644
--- a/src/model/CapteurAbstrait.java
+++ b/src/model/CapteurAbstrait.java
@@ -2,6 +2,6 @@ package model;
 
 import javafx.beans.property.ObjectProperty;
 
-public interface CapteurAbstrait {
-    public ObjectProperty<Double> genTemp();
+public abstract class CapteurAbstrait {
+    public abstract ObjectProperty<Double> genTemp();
 }
diff --git a/src/model/CapteurVirtuel.java b/src/model/CapteurVirtuel.java
index 4ec8758..813d020 100644
--- a/src/model/CapteurVirtuel.java
+++ b/src/model/CapteurVirtuel.java
@@ -5,7 +5,7 @@ import javafx.beans.property.SimpleObjectProperty;
 
 import java.util.List;
 
-public class CapteurVirtuel implements CapteurAbstrait{
+public class CapteurVirtuel extends CapteurAbstrait {
 
     private List<CapteurAbstrait> capteurs;
 
@@ -26,9 +26,9 @@ public class CapteurVirtuel implements CapteurAbstrait{
         avg.setValue((double) 0);
 
         for (CapteurAbstrait c: capteurs) {
-            avg.setValue(c.genTemp() + avg.getValue());
+            avg.setValue(c.genTemp().getValue() + avg.getValue());
         }
         avg.set(avg.getValue()/capteurs.size());
-        return avg.getValue();
+        return avg;
     }
 }