From b21fcab8f2c8a8e6644754fd1b8cdb51406fd588 Mon Sep 17 00:00:00 2001 From: dohodin Date: Sat, 21 Jan 2023 17:31:52 +0100 Subject: [PATCH] Virtual Captor Display Working (button not assigned yet) --- .../ProjetJavaFX/model/CapteurVirtuel.class | Bin 4908 -> 4595 bytes .../ProjetJavaFX/view/MainPage$1$1.class | Bin 1670 -> 0 bytes .../ProjetJavaFX/view/MainPage$1.class | Bin 1278 -> 0 bytes .../ProjetJavaFX/view/MainPage.class | Bin 8459 -> 8724 bytes Source/src/model/CapteurVirtuel.java | 14 +- Source/src/view/MainPage.java | 172 ++++++++++-------- 6 files changed, 93 insertions(+), 93 deletions(-) delete mode 100644 Source/out/production/ProjetJavaFX/view/MainPage$1$1.class delete mode 100644 Source/out/production/ProjetJavaFX/view/MainPage$1.class diff --git a/Source/out/production/ProjetJavaFX/model/CapteurVirtuel.class b/Source/out/production/ProjetJavaFX/model/CapteurVirtuel.class index b58f427408b56fd78bff37803769fa85fa4afebe..613810cbbae1476c6630302bb1dcd3d7d75639c8 100644 GIT binary patch delta 1655 zcmZ8hYgANK6#mZ4y>pp6XU18;l7}s_1sKevs7q^U8kLY?u)-irvh*T1M8+8!?kHqA z_R=hS;Auq|y-TvRKx_movv*?I!`|AP>f@}`f9xz}88;V4c;>x*$V;wGK zaMgz*bpbQZkqU;pIM(BC(c?JJbuaGI(9W>|LL7C>8m&^_=x0ByqXQ3W=;YXlhs4EN z9(!0cXt^aFc$7nhkoLzpp1_j~&KA=uG0bJ5AcIm+TUaBFPjhU7gF$VvjIgES8En?@ zEXQnW&_1nj!WIVaNWN88xG~tE!-MBJUXXrzq`BU(%o4*gH1zi6r_5%fP8D4dYBPgD zQ*3hX^|-4nV{sETxZ0o^MMw{bc4vk-pl|kkq2o&&&~T9BD}3Fz!KJW*{i9TTC*vIA z_z3&GaFAjv11}@O@T`E*(qgt~_*v}Y*~+gBesQMD@6hl&LmnOTIL&R=5^Axj;V&`M z?Ng30)F8VP*UwN8>LBcWY#7h!Sx}vxYsJ`vU>>-5>F?u^l4V(cRhkdpF2p~?AZcGEGQuIB_Sr0zFjA}ma%n>r<4ltlSRehshF zR4MO7c{Z%V8+endQs|<;g|~_E9kR>e4CD6@euy+)s3(xl>{=9|rb%LyqPgD*( zLXL7RGJJ!$6U2T`I_~es1KlT&ly}44OJFBP(Ux`5U}Oc^@%~LC?fIlHCd*8u;R4#O zi;`nVBkW$hOTI*$$aqNZKnfY?Z?elyruULLRFPKZkhT*Y^L;z;NV#8$;W2*|{K0O+;~0fA`^iqG$L3AJSVEIaSIszTC{oF?8?7bN^rNIdQh( z9 zEG{VO6AFq&M6D=l3m94u#9hICSHykaD{hn-^uC|ari^AL$$R&ncivsjeTQ?lo}ukO zwrekd^KrCQ>$LaRkcx7S$(X{BT4k71jhecNwe?0YXfSwlMTb3ehKBK&%5fpaF}UZ~ zM&?!5}+@ir{3-!f%UbP;q%8Q#vx-biu zsF=+$2f9dChPvlrz6yimQdEgj<#cxd3so%Qn22goujD&}9JQzuElRO7#1V!mjw+|Q z7vpjjS8&whN-@YW+}(hyRV?9%VyRf*7?je0YdNmNGSTQ55M9BLX+;t-1J!vG^}2z@ zK{HhE#&TTGaRZhyI4S!HM!kjrZsJ%4N+2Z=G_6b}?iP;K5|=_a%cxNzw{hH_TskA9 zn~{)_0fsv`)?h7zJroHF!K}t$(=s9QaZPCJOU?!BW&s+Q^R9uQPIj#LP_tn zWs8k!8rv>f)V_Tl=ZHz97O9)Bn?{jt>MGi{A5u$Lfffi~U{vX5U@>*vQ(@}!7Eyhs z>eOYT4ur?mno(MfTp>wrkr7K+u{mekKQe2y@U&5eaaDr zQ$>gS6jA8OWIIKwnrTC_@iB&CHb7OHq1d+)hdn8pfk{jm z38v?)$ZTn&WmeC3k(Nditlk8x7nO}o|HGS`#Ov+Jn_=-z#|y+RtJR%wJlHl|d}7Up zT5QpH(Yh0U5icb;$|)(?mn!fc-c?tTw6rI6L#w$_dQCQhQ-)sl1{cmr1ci7z&hZr5#r>tVfYtUBgHi%L^PQ zWjorjQf>k<+&HH&x5s{^+}$j_vtqcFIwV&08WNQv@zJ{&ugP#K_c^pb7X=uBne;mw zBk7$fgo#n~V2!ro_YulRxx9>5NKT+`#g%Ep61c5am)X@Q8agrFrD+6Nb3A!^Ic-+Sdi!=k0Bva0+HiOCKZnbjVQ(d<3m)RwoRC#N zSt%5gwS?>w$Ww}Rdg;CNFdv_vbi%%kcjzq8yIUMlq>y8hip_R%z1tN*MWVTxyU{ew zw-fi5`IQ)&{V_b;-Pa7t6DX&9C)3k0g(kY9>pmbeaf^$p`ySpWdWH{@6e#ypQaN+O zVt8~Pww)-!N{g+B0@G~reWH_6#UtonD$qg0v7ro6<@E2zM|8}NLv+xF w^FGEWw2+GYl#JitTl&h?5BQP3KasB=?Uv(b{OWX}1Bda4;=-T!8=c7h7cgLyp#T5? diff --git a/Source/out/production/ProjetJavaFX/view/MainPage$1$1.class b/Source/out/production/ProjetJavaFX/view/MainPage$1$1.class deleted file mode 100644 index f10e1585fb205908fa3ba222ff3ed2c39a33b414..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1670 zcmZ`(Yf~dd6g^EQObEj(JY*4EbW!t=jVOu>h^)X0nq*f4QE;_tNSf@d!wfakLHH^1 z2mGv7g(|I5KkZieYy1IQmZv9SSumz5(~o=m_Bp5Ty?_1l>+b+Q!owuG5Hn#|h@)Fz z>al%nADraFs`O;O>U%2i-F(3b)tYo&f$n9;bJU7JES;$&kPv{5khIVXOCZ@es@Y0z zDS0R`mM-XMdDr&p`TP5iWmPThWhzPZW5C3qg(0K_Mh^X&bn|QWk&=y|;smN8c~O5| zs%?3ARP;}!=SljdGcSZ&_Z$1JTuNdDqb9~Iyo7Oq!OQzv4gv|~msQ|+_3IH@yNob_ zmrYDsn8GUpL&uK%K3}vQ?}1&HGjlU@0%oY8oG5|O7a6q!WGX!jF>T>hye2R_V~3#( zl;eBhx)a(2SrZU@CT0Z2FX7$2@Y)ChKS<&hVp^9sEu@j5j!syTbz3>dWKOB~63CIj z?7_*bB9hqy$91O{r}y24)W>Em+}6k9PPpl-1l}f)>%M`kX|C^BcvllmkW^Wnx;#ID z_w@6Aq=)0m$5{p zuAH8-Q}?Jtz{3ks|)m7VsHo1`51$5XLjz?TXJZ z#c#5Ia9wxZHv4({$LN*J=Ke(gWE1n9mDK*aX}6S2;C`gDeunwT0t}@Vnz(ZY)A$ia w>=)epZy*gPjxKAJb$|z4bP@9x(O9N7`hj<-%U-mzKvjSgeReqN-$ZNp7sKCmG5`Po diff --git a/Source/out/production/ProjetJavaFX/view/MainPage$1.class b/Source/out/production/ProjetJavaFX/view/MainPage$1.class deleted file mode 100644 index 865965570ecf99b07b21004e3d5096738ff007bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1278 zcmaiz+iuf95QhKF$&GQFG=*?1Ef7kQLQTa5LWv3}0)gbTprS}zZrml^;@Xi9(NH>9pN}F4d*Dz z2_p)nV|EDK=k{BM%1rPSIyvrmdx9deq${?g!@lre@xDWviseyEJ?=}jpD1(Tz6_{H z$ErZ3R7bVD3YEyN#js%WVd(jBF&I|TvryF{lWNlYhhZGS{gX}G)*k7Z)@E{NYR%vE3pl+sN&eA`RD(%kG>H*1&(loz;eW67L z7wB6cHPFRH`c}sma0!=br;M*)na-)Nu|#JIvqM;gDgJ==noz~hw8>7PUQVHk|4>C- z#R`E|>9#R)sWjJUb)7UB+$cXLCpFqDC-+D*a?)J?1>-9gl#}D}#-MS$`3dSK)<(B) Zp-wV~2G((Bq-kJ-WQ9m2lIo|8#b2d*L*D=Z diff --git a/Source/out/production/ProjetJavaFX/view/MainPage.class b/Source/out/production/ProjetJavaFX/view/MainPage.class index 2ae2fa3cb7daa2f187a715e2719edbc58e55f310..668faf308e2487e2f4d014a08bfb44a1f2a24792 100644 GIT binary patch literal 8724 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 Zr~3Jkd{RDLGE;8%Ugb0Lh&+Zx{|7402bBN- diff --git a/Source/src/model/CapteurVirtuel.java b/Source/src/model/CapteurVirtuel.java index 42adccd..b4f6ba8 100644 --- a/Source/src/model/CapteurVirtuel.java +++ b/Source/src/model/CapteurVirtuel.java @@ -32,18 +32,6 @@ public class CapteurVirtuel extends Sujet implements Runnable { return this.tempMoyenne.get(); } - public boolean isNegative(){ - return (this.getTempMoyenne()<0); - } - - public boolean isHot(){ - return (this.getTempMoyenne()>30); - } - - @Override - public String toString(){ - return Double.toString(this.getTempMoyenne()); - } public void addToLesCapteurs(Captor c){ lesCapteurs.put((rand.nextInt()%10),c); @@ -68,7 +56,7 @@ public class CapteurVirtuel extends Sujet implements Runnable { while (true){ Platform.runLater(this::updateData); try{ - Thread.sleep(1); + Thread.sleep(1000); } catch (InterruptedException e){ break; diff --git a/Source/src/view/MainPage.java b/Source/src/view/MainPage.java index efd7c60..c6f5e68 100644 --- a/Source/src/view/MainPage.java +++ b/Source/src/view/MainPage.java @@ -9,27 +9,21 @@ import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.layout.*; import javafx.scene.text.Font; -import javafx.util.Callback; import model.*; -import java.io.IOException; public class MainPage { @FXML private Button FirstButton; - @FXML private Button SecondButton; - @FXML private VBox vb1; - @FXML private VBox vb2; - @FXML private ImageView open; - CPUTemp cpuTemp = new CPUTemp("CPU Captor"); CapteurVirtuel cV1 = new CapteurVirtuel("CaptVirt1"); Captor c1 = new Captor("c1"); Captor c2 = new Captor("c2"); + @FXML public void initialize() { @@ -37,82 +31,18 @@ public class MainPage { SecondButton.textProperty().set(cV1.getName()); - - ListView listview = new ListView<>(); - - - - - - ObservableList captors = FXCollections.observableArrayList( - captor->new ObservableValue[]{ - captor.getTempMoyenneProperty() - } - ); - - captors.addListener((ListChangeListener.Change c) ->{ - while (c.next()){ - if (c.wasUpdated()){ - listview.refresh(); - } - } - }); - - c1.startThread(); - c2.startThread(); - - cV1.addToLesCapteurs(c1); - cV1.addToLesCapteurs(c2); - - cV1.startThread(); - - - captors.add(cV1); - - listview.setCellFactory(new Callback<>() { - - @Override - public ListCell call(ListView captorListView) { - return new ListCell<>() { - @Override - protected void updateItem(CapteurVirtuel value, boolean empty) { - String text = ""; - super.updateItem(value, empty); - if (value != null) { - text = value.getTempMoyenne().toString(); - } - setText(text); - String style = null; - if (!empty) { - assert value != null; - if (value.isNegative()) { - style = "-fx-text-fill : blue"; - } - } - if (!empty && value.isHot()) { - style = "-fx-text-fill : red"; - } - setStyle(style); - } - }; - } - }); - - listview.setItems(captors); + open.setFitWidth(18); + open.setFitHeight(18); FirstButton.setOnAction(e -> { + vb1.getChildren().clear(); - try { - vb1.getChildren().add(setVboxCPUCaptor()); - } catch (IOException ex) { - throw new RuntimeException(ex); - } - }); + vb1.getChildren().add(setVboxCPUCaptor()); - open.setFitWidth(18); - open.setFitHeight(18); + }); SecondButton.setOnAction(e -> { + if (!vb2.getChildren().isEmpty()){ open.setImage(new Image("https://www.citypng.com/public/uploads/preview/download-black-right-triangle-png-31629764954y0662peplm.png")); @@ -120,14 +50,17 @@ public class MainPage { }else{ + vb1.getChildren().clear(); + vb1.getChildren().add(setDisplayVirtualCaptor()); open.setImage(new Image("https://cdn-icons-png.flaticon.com/512/0/159.png")); vb2.getChildren().add(setHBoxFirstCaptor()); vb2.getChildren().add(setHBoxSecondCaptor()); + } }); } - private VBox setVboxCPUCaptor() throws IOException { + private VBox setVboxCPUCaptor() { VBox FirstCaptorCPU = new VBox(); @@ -135,16 +68,24 @@ public class MainPage { ImageView FirstCaptorCPUImage = new ImageView(new Image("https://media.istockphoto.com/id/1204740322/fr/photo/cpu.jpg?s=612x612&w=0&k=20&c=cF154ASgimXysleBPyYsFMI9_GKkkTpDQ0kZTJnm_K0=")); + FirstCaptorCPUImage.setFitWidth(570); + Label FirstCaptorCPULabel = new Label("Temperature"); + FirstCaptorCPULabel.setFont(new Font("Arial", 30)); FirstCaptorCPULabel.setMaxWidth(Double.MAX_VALUE); FirstCaptorCPULabel.setAlignment(Pos.CENTER); FirstCaptorCPULabel.setWrapText(true); + if (cpuTemp.getTemperature()==0.0){ + FirstCaptorCPULabel.setFont(new Font("Arial", 15)); FirstCaptorCPULabel.textProperty().set("Impossible de récupérer la temperature du CPU, possiblement car le fichier qui contient cette temperature n'existe pas ou n'est pas au même endroit que celui utilisé lors du développement."); + }else{ + FirstCaptorCPULabel.textProperty().set("Temperature du CPU : " + cpuTemp.getTemperature() + "°C"); + } @@ -152,21 +93,27 @@ public class MainPage { FirstCaptorCPU.getChildren().add(FirstCaptorCPULabel); ObservableList CPUTemperature = FXCollections.observableArrayList( - captor-> new ObservableValue[]{ - captor.getTemperatureProperty() + + captorCPU-> new ObservableValue[]{ + captorCPU.getTemperatureProperty() } + ); CPUTemperature.addListener((ListChangeListener.Change c) ->{ + while (c.next()){ if (c.wasUpdated()){ FirstCaptorCPULabel.textProperty().set("Temperature du CPU : " + cpuTemp.getTemperature() + "°C"); } } + }); cpuTemp.startThread(); + CPUTemperature.add(cpuTemp); + return FirstCaptorCPU; } @@ -211,4 +158,69 @@ public class MainPage { } + private VBox setDisplayVirtualCaptor(){ + + VBox CaptorVirtual = new VBox(); + + Label ViewTempVirtualCaptor = new Label("Temperature moyenne des sous-capteurs du capteur virtuel : " + cV1.getTempMoyenne() + "°C"); + + ViewTempVirtualCaptor.setFont(new Font("Arial",20)); + ViewTempVirtualCaptor.setMaxWidth(Double.MAX_VALUE); + ViewTempVirtualCaptor.setAlignment(Pos.CENTER); + ViewTempVirtualCaptor.setWrapText(true); + + ImageView VirtualCaptorImage = new ImageView(new Image("https://static.thenounproject.com/png/56610-200.png")); + + VirtualCaptorImage.setFitWidth(500); + VirtualCaptorImage.setFitHeight(300); + + + CaptorVirtual.getChildren().add(VirtualCaptorImage); + CaptorVirtual.getChildren().add(ViewTempVirtualCaptor); + + c1.startThread(); + c2.startThread(); + + cV1.addToLesCapteurs(c1); + cV1.addToLesCapteurs(c2); + + cV1.startThread(); + + ObservableList VirtualCaptor = FXCollections.observableArrayList( + VirtCaptor->new ObservableValue[]{ + VirtCaptor.getTempMoyenneProperty() + } + ); + + VirtualCaptor.addListener((ListChangeListener.Change c) ->{ + while (c.next()){ + + if (c.wasUpdated()){ + + Double temp = cV1.getTempMoyenne(); + + if (temp < 0){ + + ViewTempVirtualCaptor.setStyle("-fx-text-fill : blue"); + + } else if (temp > 30) { + + ViewTempVirtualCaptor.setStyle("-fx-text-fill : red"); + + }else { + + ViewTempVirtualCaptor.setStyle("-fx-text-fill : black"); + + } + ViewTempVirtualCaptor.textProperty().set("Temperature moyenne des sous-capteurs du capteur virtuel : " + Math.round(cV1.getTempMoyenne()*10.0)/10.0 + "°C"); + } + } + }); + + VirtualCaptor.add(cV1); + + + return CaptorVirtual; + } + }