Ajout cercle progress

code/backend_reconnaissance/hand_detector.py

@@ -103,8 +103,14 @@ class HandDetector():
 				else:
 					result = False
 
+				progress = 0
+				if thumbState  == "thumbs_up":
+					progress = thumbsUpCount / (self.BUFFER_LENGTH * self.DETECTION_THRESHOLD)
+				elif thumbState == "thumbs_down":
+					progress = thumbsDownCount / (self.BUFFER_LENGTH * self.DETECTION_THRESHOLD)
+				
 				if(thumbState != "neutre"):
-					return thumbState, handLandmarks[9], np.linalg.norm(np.array(handLandmarks[9]) - np.array(handLandmarks[0])), result
+					return thumbState, handLandmarks[9], np.linalg.norm(np.array(handLandmarks[9]) - np.array(handLandmarks[0])), result, progress
 		return False
 
 

code/backend_reconnaissance/manager.py

@@ -54,8 +54,8 @@ class Manager():
         
         res = self.handDetector.detect()
         if(res != False):
-            state, coords, size, finalDecision = res
+            state, coords, size, finalDecision, progress = res
-            self.server.sendMessage({"type": "effects", "effects": [{"type": state, "x":coords[0], "y": coords[1], "width": size, "height": size}]})
+            self.server.sendMessage({"type": "effects", "effects": [{"type": "loading", "x":coords[0], "y": coords[1], "width": size, "height": size, "progress": progress},{"type": state, "x":coords[0], "y": coords[1], "width": size, "height": size}]})
             self.isLastHandPacketEmpty = False
             self.timeLastChange = time.time()
             if(finalDecision != False):

code/backend_reconnaissance/requirements.txt

@@ -5,4 +5,5 @@ mediapipe
 numpy
 pyaudio
 librosa
-scipy
+scipy
+python-dotenv

code/backend_reconnaissance/telereview.service

@@ -1,9 +0,0 @@
-[Unit]
-Description=Téléreview scripts
-
-[Service]
-Type=oneshot
-ExecStart=/home/telereview/pact71/code/setup.sh
-
-[Install]
-WantedBy=multi-user.target

code/interface_borne/assets/js/camera_page.js

@@ -127,7 +127,7 @@ class CameraPage {
         this.ctx.strokeStyle = this.spinnerColor;
 
         this.ctx.beginPath();
-        this.ctx.arc(x, y, radius, 0, progress * 2 * Math.PI);
+        this.ctx.arc(x + radius / 2, y + radius / 2, radius, 0, progress * 2 * Math.PI);
         this.ctx.stroke();
     }
 
@@ -150,4 +150,4 @@ class CameraPage {
     reset() {
         this.activeEffects = [];
     }
-}
+}

code/setup.sh

@@ -1,2 +1,18 @@
 #!/bin/sh
 sudo modprobe v4l2loopback devices=2
+docker compose up -d
+cd backend_reconnaissance
+nohup python3 main.py &
+sleep 10
+export DISPLAY=:0
+firefox http://localhost:8888 -kiosk
+sleep 10
+xdotool mousemove 389 169 
+sleep 0.1
+xdotool click 1
+xdotool mousemove 411 256
+sleep 0.1
+xdotool click 1
+xdotool mousemove 614 256 
+sleep 0.1
+xdotool click 1