From 97b0cd6856374aff76580f3460971d1e3e4cfdfc Mon Sep 17 00:00:00 2001 From: dohodin Date: Wed, 18 Jan 2023 15:24:12 +0100 Subject: [PATCH] First View and some Binding --- .drone.yml | 8 --- .../ProjetJavaFX/console/LView$1$1.class | Bin 1667 -> 1667 bytes .../ProjetJavaFX/console/LView$1.class | Bin 1296 -> 1296 bytes .../ProjetJavaFX/console/LView.class | Bin 3927 -> 4163 bytes .../ProjetJavaFX/fxml/FenetrePrincipale.fxml | 5 -- .../ProjetJavaFX/fxml/MainPage.fxml | 25 ++++++++++ Source/out/production/ProjetJavaFX/img/th.png | Bin 0 -> 17681 bytes .../ProjetJavaFX/model/CapteurVirtuel.class | Bin 4636 -> 4757 bytes .../ProjetJavaFX/model/Captor.class | Bin 2910 -> 2921 bytes .../ProjetJavaFX/view/MainPage.class | Bin 0 -> 689 bytes Source/resource/fxml/FenetrePrincipale.fxml | 5 -- Source/resource/fxml/MainPage.fxml | 25 ++++++++++ Source/resource/img/th.png | Bin 0 -> 17681 bytes Source/src/console/LView.java | 28 +++++++---- Source/src/model/CapteurVirtuel.java | 47 ++++++++++-------- Source/src/model/Captor.java | 4 +- Source/src/view/MainPage.java | 19 +++++++ 17 files changed, 113 insertions(+), 53 deletions(-) delete mode 100644 Source/out/production/ProjetJavaFX/fxml/FenetrePrincipale.fxml create mode 100644 Source/out/production/ProjetJavaFX/fxml/MainPage.fxml create mode 100644 Source/out/production/ProjetJavaFX/img/th.png create mode 100644 Source/out/production/ProjetJavaFX/view/MainPage.class delete mode 100644 Source/resource/fxml/FenetrePrincipale.fxml create mode 100644 Source/resource/fxml/MainPage.fxml create mode 100644 Source/resource/img/th.png create mode 100644 Source/src/view/MainPage.java diff --git a/.drone.yml b/.drone.yml index 192bd46..c8ca2cb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,10 +2,6 @@ kind: pipeline type: docker name: javaFX -trigger: - event: - - push - steps: - name: generate-and-deploy-docs image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-docdeployer @@ -19,7 +15,3 @@ steps: branch: - master depends_on: [ build ] - -volumes: - - name: docs - temp: {} \ No newline at end of file diff --git a/Source/out/production/ProjetJavaFX/console/LView$1$1.class b/Source/out/production/ProjetJavaFX/console/LView$1$1.class index b9f8657d7ffec88c50b03fbdd9fcf9028b4b50cc..c00a2e729a076fdcaf06711ba8c5b871986f14bd 100644 GIT binary patch delta 83 zcmZqXZRXvuf`!p{@=BJerU4Ah41o-s3_%RM48aVd4518C3}Fni4B-rl3=s^*43P|0 j3{ebr46zKJ3~>y;3<*G0iIa<2>w)?|vw8qY8#Z?Uv8xc% delta 83 zcmZqXZRXvuf`!p_@=BJerXCE;44w>}3|eRtJ%FSQn>zrU0}x99 diff --git a/Source/out/production/ProjetJavaFX/console/LView$1.class b/Source/out/production/ProjetJavaFX/console/LView$1.class index 89019de093f27ef5cd5fceac029d7d64f5353ce0..6be9aa3c6525231f15d5aa09e94511e76bb779fa 100644 GIT binary patch delta 25 fcmbQhHGyk`APb}CWFZzWM&HS?EGagr>KJnE-v4Mljy4%ZSiw<`8}<3diVQDD18&kI#%tp;nsBp( zW{wuz!jRLgY*O4ICG2-MuJ2ZT8bhXE)oMdZEXI&$cX%fal9!%Lw2{Ky)!!3xHz>hy zlj2wBij$00=#a3Q<5sMpjQ{7zU?t#qvl@$RjQUiD68ja{Em|}f_IuLd!m8$OZT5O( z+>W&p)^R9U&yX)5yZTeH>sB>*y%D8TjWU=*Bupay>wabOsp>p4C6HlW8Yt#d!>YSU ziK<~uLYJOxD#%n35WEKUa#P`~4OB;qrf9)PxVT|#L>n84$ml^>LWHANS4^eeoyF8o zKwN7a8?lKPjHz0Cuu}_AX7;6ywv6g{^<|^Y9CryL3mL6YgZ_XfT<_-CinxBkG^eNs z+c@q;206z9kv=H;)RPBnYv4Dg<`c|_e<1r2$kL!ocb!^}0A7&3@)Ab6|biGkJRw^&+_o=<2 zyDQ*)-gdK#aD&1nw-eWhJnsEP;EDQWi#tEcfARS_^1GW?)(zGpQ|waAFp&BdHq2 zSc%zaLn+o`4uU90A8EGWdTc`_c3?g=_6F=h6|uH}id%>wEW#oBgd8UCQ7pkp)Zz@5 z;ymgwj^+4@{`Wtj3%|gRzYt(X1epchEC(A{yZ|9qh#oc@y-D77rMOA+Ml9iJJVX4+ zYzCgCPzFq6*?5j5BZ>$r55vT#lYsL{GE=I*QeDH;i)#Fgt4NZlpo>)IFz8c(PpHsg zSg5!$JdYRRL_?4=evvA$5{MHoVFa9ji|{gDK^9&mvhpcx%Hi;3``5_+b<&AJIFcia z@ga#CjCHh&A;~A+?;FHa+8!F5_>+3K^U%a^la0tF-#9RrGIUeb*I+v4B{>k`L{Q3) zb|JliHwiRBvPm#N;b?}_;T9!Rpoue`!R`(tg&Al$LY9VPx3h^Sz)mq7l(7AZ+2mCA z(3&LVsigU7yhVEkIo44B-X>Wja*hB#z(+)!kUqud^nOXY5(-;GyLh%!kH0Zl$Sd`H Ki%a+(wtoO;0dZ;o delta 1466 zcmZ8gTTok76kR6?xo~qpq<{^z1Y4XY0Y$W(Dzpevu`RJyksy^muH-@jG1Md!s#UDo zYJIe&SF31!Kk!v8MuUK@we{_I@Vy*U8qNs+$SbpjXk4#g5fQL`=(jF=R3vL^IK^-34Ah8}BtQLE{vt1&98?90M$~Fx*2`n8jb{T!6b%|ax zX4XZG-9y94x{jpLJGj}1nL0MXuC`kwI&iCitKUqvh9l8X+>8la>h%SzdfO!{8Z`u& zeL<`a6;VegZd1i|3oQ0pe`sY(e8GI&E|4FHB$5h&j;+|HVY|c*t17QL5I;>a0QEa0 zVWN+=2{YLh2_?e<4(~c&(AhkE?jNH8i9uylK%@0$q(7Wgu6IhrFk~IhTjAM?yCmXp z(m4?xV!kAXHSCfY!Kgqj0W7i(x!jGskC~%M0lU|?MOob~agQ?5M~p=0&XAEbLyFCN zCGJzvw7A(9HxpqE_gib7KIa1x58@#!>TDDHQz>Vo@OT0X82LZDmOVd}`YFFkh3AO}G)zf+fK+Og?hxW5tHD)UKCNRPK9+b5uNSLtPN3eas8^MHs!powQxY%Y zB>}l17Bl0mQ6rHs6B<5an{tLFQoz|7He&szhR>~em*4TFK&5p~UutcXg+2RV%dqNz zV8@)?ALhA^Qc&jkry-`O*zgExjdR%4J&nx`(k;`t*{x?S=g`^hmec5JD6A>j zl15KWDU39FDf-ih)VK@Nh}NXBQ#)h``H%xB`3l;P&E5?8j9^vl54C{S;Q?Ib4mGaSbNXfa7RH3TrTfCY<5h{EkoX zM{L8-*nwYR;5_aiIlaP(kSK&HN;#hu=pPf67|0NIFiT2~Fw%pAI7G^HQO1Phq_|YL zaD2Y9ZW$e0DAh`m!ZVHndS%yHe1Wgv{u_G2EQJ67 diff --git a/Source/out/production/ProjetJavaFX/fxml/FenetrePrincipale.fxml b/Source/out/production/ProjetJavaFX/fxml/FenetrePrincipale.fxml deleted file mode 100644 index 2e8219a..0000000 --- a/Source/out/production/ProjetJavaFX/fxml/FenetrePrincipale.fxml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/Source/out/production/ProjetJavaFX/fxml/MainPage.fxml b/Source/out/production/ProjetJavaFX/fxml/MainPage.fxml new file mode 100644 index 0000000..2f94644 --- /dev/null +++ b/Source/out/production/ProjetJavaFX/fxml/MainPage.fxml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/Source/out/production/ProjetJavaFX/img/th.png b/Source/out/production/ProjetJavaFX/img/th.png new file mode 100644 index 0000000000000000000000000000000000000000..a2ce61d8bb4d1b8825ecac73144f37534eef92ed GIT binary patch literal 17681 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 literal 0 HcmV?d00001 diff --git a/Source/out/production/ProjetJavaFX/model/CapteurVirtuel.class b/Source/out/production/ProjetJavaFX/model/CapteurVirtuel.class index b795070e22d2b4f858dbfb47c653f3e8ffe5106f..68a8b158299882fc7895b7212a6182b033ee327a 100644 GIT binary patch delta 2145 zcmZ`)X>=1+6#iZ^$uyHkC?P^i)dRL@n!t&0v}HAmWC&GXD&Rw$^(1Q~vgiMZ0ZP#S5i;h2mmMp*LX zRbwj0RTytO$2QR6|X^N%ix!2EAOyt;RNML81*SIBpZ(Rw6h-TdW{} zJ2>t{6GL7gq}QpzxMoKi?&i2h_~nsb%BT>bdpYjI6b1(wr)td+EvoAAsOAL2{T!?C z0F^8n4>1gJ`T|=p@V;d==8)lUD64<~x!o z>qv|4qUB-IIw=V$)jbaslEqmmBg+VQa0y1y*_=u5*(j$gcrhyBwWlaqxEl8+Z2U7R`t|~ z{#;D-qoMKah5?GXTIs?=9j8wCJ7A{z)5V5fgt0Mm{05{dT1nP%WS>AQRWxYTG-MOA zed$BKZ{jW5D~2&WU?P(|vQLt+(M&6EXEUhH9D=@kuztE{7asF_r6fAMNj#O)e<$$- z4X=$x&Ot-xL~S-6Xw1`5Y*gNN@Ge-sN!&~nN1W7=^c5T}Gyz*hFLH;nAP1&ruEiW3 z#QR`lDYp+&8$QHG^cAP>W3qjPujvuecQ{JVF3+3*|wzzG!o E1CSxj5C8xG delta 1997 zcmZ{lX>=1+7>3_TW-`s>HqQNALw^yhBj~xKQeRgH}8G!x80ld1GkiF zhfeO>58z7tv0K~b_D#S<6*UaCsN?%xg?Tf~cqr1;5Rb-;xY;Jb-DL3oo}$Wn2{}vk zR=pyuN17^Zm4?eOMJ%04y5QjP8m3{oiWv+uaWy~c9^skIa1G{gzg(6z4RaahVJaUZ z7t&+_gN}t8q30)THETcxjJjAdCb0ql5IMZmM zyz6E%o-#D}v6bNw@l8v{8gy0xocDK^ z^1n3Iqv9tCrPlN~^U1$T7|3_}^4BqsKT%pAjW#D^Dt?o2u4CoHvd@vgYqCp9o}+W& z!t=;QIWB|*d%hEl#tJIwxr?vPUYOcVx(nc?X8=Ot+*5A(x%ieELhF0m((n;>w&P5|YY*&!R zYF|`G%+yU9WgUs%X=qoZ%xsEq4lSY9n zXN<_=D?QX&hZ=CG0bI9X>shduWMBh?O^M<-++2&RXXN)(z_zztn15!#muKL51Ky9t zR7s&7MvjVrHOkrGZY;73mr>;uuE;=WPM~%VzDi3E;5B**R0E|)bX0*rb)qSamK-hC zg+zHbmb)=qG>#3{ES>1Zt1PzNi3JXu2zVWD5YpCUl;|28FGlwYx7LhQiVKx)tQ8Y8jRzKt3Z6D^7qboG>yk7!Q?Z*D)pq>X zRlEt_pnt<=Wcft{rGmxnQKyq+tNivEt0wOzP+cdY3^f=@e>d|`hxwR<5b6=Z6f3ea zQj}pR-o#tf805SYql@n1xA6|eC?k${agb<-=({*fw*EcRi?XNsKt73pk;uoC2?~ diff --git a/Source/out/production/ProjetJavaFX/model/Captor.class b/Source/out/production/ProjetJavaFX/model/Captor.class index 2f6d75828e243172cf0e2f9c74fd4339181a9718..1e9cfd18f96da1de12ebd008a60ef47cc93786a8 100644 GIT binary patch delta 1267 zcmZ9L+jCP@6vlu1B+W_A*-bGGy(mM$gqEggK)Hw@P^mDK3SzO^s%XThTzWA{D_-LT z?-$VR1@Di%TB~UWM#pDoeDm3NpB(%H)U{8JZKlbbv-Vzlt?&ER+Uxw$@n?tk>pxe1 z2KMspy!VL8#`dLUCqIuhtk<+~qawO-sDCU$lB{L}z2>~y>2IXpC8rr+lgT^XCa03- zFV&-NHf_#oe=}QLZn3Ag%4y!;#&(w-n%mfEPB}ZeHnU5!+hRw`#Y#%}_Gr#J~TB|EbTvAD3^<6moF6?%(Ymj`OS4(vm?{fXJ%(yzE-Raz1_RYL`iX-JjioB zHw0F0L2Q>TL9B;VMyI@IWp`TEj@VwaKE9@!X6+*Dek3z5E{8dJcSr!F1-KQT)somD z*V@T5!C8>XIi8iBfC%Mt0<3r*9TMb&J+$P0p!GWmYQV5~HUH!w;n>UZNU8Gz-YAOwKeVw@_^qqIj8CmIOGm0xKX>BVT9h zN{qfHjAa2b6d}YQ5&1*HLiE+ReYv?_(E9=6Y_cGu(p%fn#8O8S((6|RN6Ea~mf0(t zl^7eb*m+n`<{t3Cu%&J=7}e3Jhe>Fn3OF|O-_Z%FUbBNvbI-S@ruL#s7rPzyXkMh-^!c0BOXjS2!N zPZ1Kp&QyA2G;13<(AsaE{hC*)R#fE+sa(OfHmEtkLG!o2B|OAy4k^v+ykTkr8=Etl zW0qP(kowXiC)2r9VJw$+Il-F_!=Ntz=e{F^RFd*C%eW6{gu< z#|zW!y8ht*?(6s`BrHS?QT9sNf{D3}1GA4+E0znqFAQ$rIbc(ZsI| z)N!c9;X00FN*tXRWM(YZS120wFoRs2Ls})%Xg`r#3=Qs_=J*t&lMGlGRUXikGjC}jT$PME7Oyw=?!I8 zp#D}HZQlvZwc6c9EMU<`5aJO+foQ1dvpiPXbX1SHJXa~@2Sds}Xmh1aPhcZ)$m@}; zGBPBy!q~FNW#Wu+fF(41EQffEroh_2tpcH?k?oYlEtU3*K&#cBl2cNqlDCtTJhvrx zo;u?NJQZjhc0O)jP@jvH9h4N{8J_!i5n>f<0(+Cj|0VGRD&m2xw8o8Rrxdrl0;^{O zV|Aapy3%P*2gVduSzVY)pgFzk^{AiAqs!wY7N{K-S3I;vq79u4`YDwciVK~)$W-1{ zrFQ4Z$C~}5nbb%g%$zZS+mBYc{>r7nc`+z6I?|34O*iw#{U2WO@;qL<;K=J^UFTDs zb%WJo - - - - diff --git a/Source/resource/fxml/MainPage.fxml b/Source/resource/fxml/MainPage.fxml new file mode 100644 index 0000000..2f94644 --- /dev/null +++ b/Source/resource/fxml/MainPage.fxml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/Source/resource/img/th.png b/Source/resource/img/th.png new file mode 100644 index 0000000000000000000000000000000000000000..a2ce61d8bb4d1b8825ecac73144f37534eef92ed GIT binary patch literal 17681 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 literal 0 HcmV?d00001 diff --git a/Source/src/console/LView.java b/Source/src/console/LView.java index 30e1e3f..87c0211 100644 --- a/Source/src/console/LView.java +++ b/Source/src/console/LView.java @@ -1,5 +1,7 @@ package console; +import javafx.fxml.FXMLLoader; +import javafx.scene.Parent; import model.*; import javafx.application.Application; import javafx.collections.ObservableList; @@ -11,14 +13,17 @@ import javafx.util.Callback; import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; -import javafx.scene.layout.StackPane; + +import java.io.IOException; public class LView extends Application { @Override - public void start(Stage primaryStage) { - CapteurVirtuel cV1 = new CapteurVirtuel("CaVirt1"); - CapteurVirtuel cV2 = new CapteurVirtuel("CaVirt2"); + public void start(Stage primaryStage) throws IOException { + CapteurVirtuel cV1 = new CapteurVirtuel("CaptVirt1"); + CapteurVirtuel cV2 = new CapteurVirtuel("CaptVirt2"); + + Captor c1 = new Captor("c1"); Captor c2 = new Captor("c2"); @@ -59,6 +64,9 @@ public class LView extends Application { cV2.addToLesCapteurs(c5); cV2.addToLesCapteurs(c6); + cV1.startThread(); + cV2.startThread(); + captors.add(cV1); captors.add(cV2); @@ -92,13 +100,11 @@ public class LView extends Application { }); listview.setItems(captors); - - final StackPane root = new StackPane(); - root.getChildren().add(listview); - final Scene scene = new Scene(root); - primaryStage.setTitle("ListView"); - primaryStage.setWidth(300); - primaryStage.setHeight(350); + Parent root = FXMLLoader.load(getClass().getResource("/fxml/MainPage.fxml")); + Scene scene = new Scene(root); + primaryStage.setTitle("Station Météo"); + primaryStage.setWidth(900); + primaryStage.setHeight(500); primaryStage.setScene(scene); primaryStage.show(); diff --git a/Source/src/model/CapteurVirtuel.java b/Source/src/model/CapteurVirtuel.java index 8515ad0..5a89e49 100644 --- a/Source/src/model/CapteurVirtuel.java +++ b/Source/src/model/CapteurVirtuel.java @@ -1,6 +1,7 @@ package model; +import javafx.application.Platform; import javafx.beans.property.DoubleProperty; import javafx.beans.property.SimpleDoubleProperty; import javafx.beans.property.SimpleStringProperty; @@ -9,7 +10,7 @@ import javafx.collections.*; import java.util.*; import static model.Captor.rand; -public class CapteurVirtuel extends Sujet{ +public class CapteurVirtuel extends Sujet implements Runnable { private final UUID id= UUID.randomUUID(); private final StringProperty nom; @@ -20,19 +21,7 @@ public class CapteurVirtuel extends Sujet{ public CapteurVirtuel(String nom){ this.nom= new SimpleStringProperty(nom); this.tempMoyenne.set(0.0); - lesCapteurs.addListener((MapChangeListener) c -> { - this.tempMoyenne.set(this.updateData()); - System.out.println("HEY"); - }); - } - - public UUID getId() - { - return this.id; - } - - public String getName(){ - return this.nom.get(); + lesCapteurs.addListener((MapChangeListener) c -> this.updateData()); } public DoubleProperty getTempMoyenneProperty(){ @@ -56,16 +45,11 @@ public class CapteurVirtuel extends Sujet{ return Double.toString(this.getTempMoyenne()); } - - public Collection getLesCapteurs(){ - return lesCapteurs.values(); - } - public void addToLesCapteurs(Captor c){ lesCapteurs.put((rand.nextInt()%10),c); } - private Double updateData() { + private void updateData() { int coef = 0; double valeurs =0; for (Map.Entry entry : lesCapteurs.entrySet()){ @@ -73,10 +57,29 @@ public class CapteurVirtuel extends Sujet{ valeurs += entry.getKey() * entry.getValue().getTemperature(); } if (coef==0 || valeurs==0){ - return 0.0; + this.tempMoyenne.set(0.0); }else { - return valeurs / coef; + this.tempMoyenne.set(valeurs/coef); } } + @Override + public void run(){ + while (true){ + Platform.runLater(this::updateData); + try{ + Thread.sleep(1); + } + catch (InterruptedException e){ + break; + } + } + } + + public void startThread(){ + Thread threadVirtualCaptor = new Thread(this); + threadVirtualCaptor.setDaemon(true); + threadVirtualCaptor.start(); + } + } diff --git a/Source/src/model/Captor.java b/Source/src/model/Captor.java index 790c844..ba481c9 100644 --- a/Source/src/model/Captor.java +++ b/Source/src/model/Captor.java @@ -19,7 +19,7 @@ public class Captor implements Runnable{ public Captor(String name){ this.name=new SimpleStringProperty(name); - this.temperature=new SimpleDoubleProperty(1.0); + this.temperature=new SimpleDoubleProperty(5.0); } public UUID getId() @@ -48,7 +48,7 @@ public class Captor implements Runnable{ while (true){ Platform.runLater(()->setTemperature(rand.nextDouble(80.)-20.)); try{ - Thread.sleep(5000); + Thread.sleep(2999); } catch (InterruptedException e){ break; diff --git a/Source/src/view/MainPage.java b/Source/src/view/MainPage.java new file mode 100644 index 0000000..675d055 --- /dev/null +++ b/Source/src/view/MainPage.java @@ -0,0 +1,19 @@ +package view; + +import console.LView; +import javafx.event.EventHandler; +import javafx.fxml.FXML; + +import java.awt.event.MouseEvent; + + +public class MainPage { + @FXML + private javafx.scene.control.Label labelAvecBinding; + @FXML + public void initialize() { + + labelAvecBinding.textProperty().set("CPU Temperature"); + + } +}