Merge pull request #143 from cogip/142-dashboard-add-starter-feedback-and-emulation

142 dashboard add starter feedback and emulation

Author: ecourtois

cogip/tools/dashboard/static/js/wizardModule.js

@@ -315,8 +315,8 @@ function createChoiceButton(inputType, choice, value, index) {
     class:
       "w-[15px] h-[15px] me-2 rounded-md inline-block bg-white checked:accent-red-cogip",
     value: choice,
-    checked: isChecked,
   });
+  if (isChecked) button.checked = true
   return button;
 }
 // Helper function to create labels for choice inputs

cogip/tools/dashboard/templates/dashboard.html

@@ -53,16 +53,21 @@
       </div>
 
       <footer class="mt-auto bg-zinc-900 text-grey-color mx-2">
-        <div class="container-lg pt-2">
-          <span class="text-muted float-left" id="connection">
+        <div class="container-lg pt-2 flex items-center justify-between">
+          <span class="text-muted inline" id="connection">
             <pre
-              class="text-grey-color text-sm inline"><img class="mr-5 w-[20px] inline" src="{{ url_for('static', path='img/cross_red_circle.svg') }}" /></pre>
+              class="text-grey-color text-sm"><img class="mr-5 w-[20px]" src="{{ url_for('static', path='img/cross_red_circle.svg') }}" /></pre>
           </span>
           {% if robot_id != 0 %}
-          <span class="text-muted float-right inline" id="state">
+          <span class="text-muted text-sm inline" id="state">
             <pre id="state_robot"></pre>
             <pre id="order_robot"></pre>
           </span>
+          <span class="text-muted text-sm z-10" id="starter">
+            <label>
+              <input type="checkbox" class="checked:accent-red-cogip checked:border-red-cogip" disabled> Starter
+            </label>
+          </span>
           {% endif %}
         </div>
       </footer>
@@ -147,9 +152,13 @@ <h5 class="text-lg font-medium text-grey-color">Score</h5>
       socket.on("connect", function () {
         socketModule.onConnection(this);
       })
-        .on("disconnect", function () {
+      .on("disconnect", function () {
           socketModule.onDisconnect();
         })
+        .on("virtual", function (robot_id, msg) {
+          console.log(!msg)
+          document.querySelector("#starter input").disabled = !msg;
+        })
         .on("tool_menu", function (menu) {
           socketModule.onMenu(menu, "tool", this);
           virtualKeyboard._actualize();
@@ -178,8 +187,16 @@ <h5 class="text-lg font-medium text-grey-color">Score</h5>
         })
         .on("obstacles", function (robot_id, msg) {
           drawModule.updateObstacles(robot_id, msg);
+        })
+        .on("starter_changed", function(robot_id, pushed) {
+          document.querySelector("#starter input").checked = pushed;
         });
 
+      // add event listener on click for starter input
+      document.querySelector("#starter input").addEventListener("click", function () {
+        socket.emit("starter_changed", this.checked);
+      });
+
       if (robotId !== 0) {
         import("../static/js/scoreModule.js").then((scoreModule) => {
           socket.on("score", function (score) {
@@ -218,11 +235,10 @@ <h5 class="text-lg font-medium text-grey-color">Score</h5>
           console.log(`Delete robot ${robot_id} dashboard`);
           drawModule.deleteTab(robot_id);
         })
-
       }
     });
 
   </script>
 </body>
 
-</html>
+</html>

cogip/tools/monitor/mainwindow.py

@@ -623,7 +623,10 @@ def starter_toggled(self, robot_id: int, checked: bool):
 
     def starter_changed(self, robot_id: int, checked: bool):
         if starter_checkbox := self.robot_starters.get(robot_id):
+            enabled = starter_checkbox.isEnabled()
+            starter_checkbox.setEnabled(False)
             starter_checkbox.setChecked(checked)
+            starter_checkbox.setEnabled(enabled)
 
     def closeEvent(self, event: QtGui.QCloseEvent):
         settings = QtCore.QSettings("COGIP", "monitor")

cogip/tools/monitor/socketiocontroller.py

@@ -161,7 +161,7 @@ def actuators_closed(self):
 
     @qtSlot(int, bool)
     def starter_changed(self, robot_id, pushed: bool):
-        self.sio.emit("starter_changed", pushed, namespace="/monitor")
+        self.sio.emit("starter_changed", pushed, namespace="/dashboard")
 
     def on_menu(self, menu_name: str, data):
         menu = models.ShellMenu.model_validate(data)
@@ -334,7 +334,7 @@ def on_cmd_reset() -> None:
             """
             self.signal_planner_reset.emit()
 
-        @self.sio.on("starter_changed", namespace="/monitor")
+        @self.sio.on("starter_changed", namespace="/dashboard")
         def on_starter_changed(robot_id: int, pushed: bool) -> None:
             """
             Change the state of a starter.

cogip/tools/planner/wizard.py

@@ -127,7 +127,7 @@ async def request_strategy(self):
     async def response_strategy(self, message: dict[str, Any]):
         value = message["value"]
         self.game_strategy = Strategy[value]
-        self.game_context.strategy = Strategy.AlignTest
+        self.game_context.strategy = Strategy.TestAlign
         await self.planner.soft_reset()
 
     async def request_starter_for_calibration(self):

cogip/tools/server/namespaces/dashboard.py

@@ -26,6 +26,9 @@ async def on_connected(self, sid):
         if self.context.shell_menu:
             await self.emit("shell_menu", (self.context.robot_id, self.context.shell_menu.model_dump()), to=sid)
 
+        if self.context.virtual:
+            await self.emit("virtual", (self.context.robot_id, self.context.virtual), to=sid)
+
     def on_disconnect(self, sid):
         logger.info("Dashboard disconnected.")
 
@@ -97,3 +100,10 @@ async def on_wizard(self, sid, data: dict[str, Any]):
         namespace = data.pop("namespace")
         await self.emit("wizard", data, namespace=namespace)
         await self.emit("close_wizard")
+
+    async def on_starter_changed(self, sid, pushed: bool):
+        """
+        Callback on starter_changed message.
+        """
+        await self.emit("starter_changed", pushed, namespace="/planner")
+        await self.emit("starter_changed", (self.context.robot_id, pushed), namespace="/dashboard", skip_sid=[sid])

cogip/tools/server/namespaces/monitor.py

@@ -31,9 +31,3 @@ async def on_connected(self, sid):
     def on_disconnect(self, sid):
         self.context.monitor_sid = None
         logger.info("Monitor disconnected.")
-
-    async def on_starter_changed(self, sid, pushed: bool):
-        """
-        Callback on starter_changed message.
-        """
-        await self.emit("starter_changed", pushed, namespace="/planner")

cogip/tools/server/namespaces/planner.py

@@ -96,7 +96,7 @@ async def on_starter_changed(self, sid, pushed: bool):
         """
         Callback on starter_pushed message.
         """
-        await self.emit("starter_changed", (self.context.robot_id, pushed), namespace="/monitor")
+        await self.emit("starter_changed", (self.context.robot_id, pushed), namespace="/dashboard")
 
     async def on_close_wizard(self, sid):
         """

cogip/tools/server_beacon/robot.py

@@ -104,11 +104,11 @@ async def pami_reset():
                     strategy: actions.Strategy | None = None
                     match robot_id:
                         case 2:
-                            strategy = actions.Strategy.PAMI2
+                            strategy = actions.Strategy.Pami2
                         case 3:
-                            strategy = actions.Strategy.PAMI3
+                            strategy = actions.Strategy.Pami3
                         case 4:
-                            strategy = actions.Strategy.PAMI4
+                            strategy = actions.Strategy.Pami4
 
                     if strategy:
                         await robot.sio.emit(