diff --git a/code/backend_reconnaissance/hand_detector.py b/code/backend_reconnaissance/hand_detector.py index 929a8c7..7427153 100644 --- a/code/backend_reconnaissance/hand_detector.py +++ b/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 diff --git a/code/backend_reconnaissance/manager.py b/code/backend_reconnaissance/manager.py index 77ce753..bd26c53 100644 --- a/code/backend_reconnaissance/manager.py +++ b/code/backend_reconnaissance/manager.py @@ -54,8 +54,8 @@ class Manager(): res = self.handDetector.detect() if(res != False): - state, coords, size, finalDecision = res - self.server.sendMessage({"type": "effects", "effects": [{"type": state, "x":coords[0], "y": coords[1], "width": size, "height": size}]}) + state, coords, size, finalDecision, progress = res + 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): diff --git a/code/backend_reconnaissance/requirements.txt b/code/backend_reconnaissance/requirements.txt index 18cb6b8..5100bc7 100644 --- a/code/backend_reconnaissance/requirements.txt +++ b/code/backend_reconnaissance/requirements.txt @@ -5,4 +5,5 @@ mediapipe numpy pyaudio librosa -scipy \ No newline at end of file +scipy +python-dotenv diff --git a/code/backend_reconnaissance/telereview.service b/code/backend_reconnaissance/telereview.service deleted file mode 100644 index cb88c54..0000000 --- a/code/backend_reconnaissance/telereview.service +++ /dev/null @@ -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 diff --git a/code/interface_borne/assets/js/camera_page.js b/code/interface_borne/assets/js/camera_page.js index 876ec7f..9009833 100644 --- a/code/interface_borne/assets/js/camera_page.js +++ b/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 = []; } -} \ No newline at end of file +} diff --git a/code/setup.sh b/code/setup.sh index 206acad..cade588 100755 --- a/code/setup.sh +++ b/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