X-Git-Url: https://melusine.eu.org/syracuse/G/git/?p=mp-scratch.git;a=blobdiff_plain;f=src%2FCapteurs.mp;h=7375b115dcfdc1b2cc45672150faff12d79d9442;hp=3785667d26ca5f1c1e80f4cb9e5c641cd048431b;hb=98510de4ba0aff4f5d97eb29ee7779abe9c6b47c;hpb=45b57c4a264c463c8a0d5cd71ba351c6782804b3

diff --git a/src/Capteurs.mp b/src/Capteurs.mp
index 3785667..7375b11 100644
--- a/src/Capteurs.mp
+++ b/src/Capteurs.mp
@@ -1,11 +1,21 @@
 vardef AffichageCap=
   path cadre;
-  cadre=(llcorner texto+(-eb,-eb))--(lrcorner texto+(eb,-eb))--(urcorner texto+(eb,eb))--(ulcorner texto+(-eb,eb))--cycle;
+  cadre=(llcorner texto+(-eb,0))--(llcorner texto+(0,-eb))--
+    (llcorner texto+(0.375cm,0)+(-eb,-eb))--
+    (llcorner texto+(0.375cm,0)+(0,-2eb))--
+    (llcorner texto+(0.625cm,0)+(0,-2eb))--
+    (llcorner texto+(0.625cm,0)+(eb,-eb))--
+    (lrcorner texto+(0,-eb))--(lrcorner texto+(eb,0))--(urcorner texto+(eb,0))--(urcorner texto+(0,eb))--
+    (ulcorner texto+(0.625cm,0)+(eb,eb))--
+    (ulcorner texto+(0.625cm,0))--
+    (ulcorner texto+(0.375cm,0))--
+    (ulcorner texto+(0.375cm,0)+(-eb,eb))--
+    (ulcorner texto+(0,eb))--(ulcorner texto+(-eb,0))--cycle;
   picture TEXT;
   TEXT=image(
-      fill cadre withcolor LightBlue;
+      fill cadre withcolor if unknown colCapteur : LightBlue else: colCapteur fi;
     draw texto;
-    draw (llcorner texto+(-eb,-eb))--(lrcorner texto+(eb,-eb))--(urcorner texto+(eb,eb))--(ulcorner texto+(-eb,eb))--cycle;
+    draw cadre;
     );
   TEXT
 enddef;
@@ -14,10 +24,11 @@ vardef Demander(expr nbpas)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Demander "&nbpas&" et attendre"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} demander "&nbpas&" et attendre"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageCap shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner Affichage);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
@@ -25,10 +36,11 @@ vardef ActiverVideo(expr nbpas)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Activer la vidéo \opCap{"&nbpas&"}"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} activer la vidéo \opCapCap{\normalfont "&nbpas&"}"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageCap shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner Affichage);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
@@ -36,10 +48,11 @@ vardef TransparenceVideo(expr nbpas)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Mettre la transparence vidéo à "&if numeric nbpas:"\colorbox{white}{\textcolor{black}{"&decimal(nbpas)&"}}" else: nbpas fi&"~\%"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} mettre la transparence vidéo à "&if numeric nbpas:"\colorbox{white}{\textcolor{black}{"&decimal(nbpas)&"}}" else: nbpas fi&"~\%"),if unknown _coinprec:(0,0) else: _coinprec fi);
     );
   $=AffichageCap shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner Affichage);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -47,9 +60,10 @@ vardef ReinitChrono=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Réinitialiser le chronomètre"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} réinitialiser le chronomètre"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageCap shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner Affichage);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;