From 49b1e19149216bbb87d7015450d934f291667da7 Mon Sep 17 00:00:00 2001 From: 3C Cloud Computing Club <114175379+3C-SCSU@users.noreply.github.com> Date: Thu, 23 Oct 2025 18:29:47 -0500 Subject: [PATCH] Revert "#421 - Drone tab functionality fix" --- GUI5.py | 31 +++++-------------------------- ManualDroneControl.qml | 14 -------------- 2 files changed, 5 insertions(+), 40 deletions(-) diff --git a/GUI5.py b/GUI5.py index cd794f3a..64f3a700 100644 --- a/GUI5.py +++ b/GUI5.py @@ -18,7 +18,6 @@ from brainflow.board_shim import BoardShim, BrainFlowInputParams, BoardIds from GUI5_ManualDroneControl.cameraview.camera_controller import CameraController from NAO6.nao_connection import send_command -from PySide6.QtCore import Property # from Developers.hofCharts import main as hofCharts, ticketsByDev_text NA from Developers import devCharts @@ -57,7 +56,6 @@ class BrainwavesBackend(QObject): logMessage = Signal(str) naoStarted = Signal() naoEnded = Signal() - isConnectedChanged = Signal() @Slot() def startNaoManual(self): @@ -94,15 +92,7 @@ def nao_stand_up(self): self.fligt_log.insert(0, "Nao failed to stand up.") self.flightLogUpdated.emit(self.flight_log) - def get_is_connected(self): - return self.isConnectedChanged - def set_is_connected(self, value): - if self.is_connected != value: - self.is_connected = value - self.isConnectedChanged.emit() - - is_connected_prop = Property(bool, get_is_connected, set_is_connected, notify=isConnectedChanged) @Slot(result=str) @@ -211,7 +201,6 @@ def __init__(self): self.image_paths = [] # Store converted image paths self.plots_dir = os.path.abspath("plotscode/plots") # Base plots directory self.current_dataset = "refresh" # Default dataset to display - self.is_connected = False try: self.tello = Tello() except Exception as e: @@ -373,20 +362,11 @@ def keepDroneAlive(self): @Slot(str) def getDroneAction(self, action): - if action == 'connect': - try: + try: + if action == 'connect': self.tello.connect() - self.is_connected = True self.logMessage.emit("Connected to Tello Drone") - except: - self.is_connected = False - self.logMessage.emit("Error during connect: {e}") - return - elif not self.is_connected: - self.logMessage.emit(f"Drone not connected. Aborting command '{action}'.") - return - try: - if action == 'up': + elif action == 'up': self.tello.move_up(30) self.logMessage.emit("Moving up") elif action == 'down': @@ -399,7 +379,7 @@ def getDroneAction(self, action): self.tello.move_back(30) self.logMessage.emit("Moving backward") elif action == 'left': - self.tello.move_lef(30) + self.tello.move_left(30) self.logMessage.emit("Moving left") elif action == 'right': self.tello.move_right(30) @@ -409,7 +389,7 @@ def getDroneAction(self, action): self.logMessage.emit("Rotating left") elif action == 'turn_right': self.tello.rotate_clockwise(45) - self.logMessage.emit("Rotationg right") + self.logMessage.emit("Rotating right") elif action == 'takeoff': self.tello.takeoff() self.logMessage.emit("Taking off") @@ -429,7 +409,6 @@ def getDroneAction(self, action): except Exception as e: self.logMessage.emit(f"Error during {action}: {e}") - # Method for returning to home (an approximation) def go_home(self): # Assuming the home action means moving backward and upwards diff --git a/ManualDroneControl.qml b/ManualDroneControl.qml index b1ea0465..0808d90b 100644 --- a/ManualDroneControl.qml +++ b/ManualDroneControl.qml @@ -10,7 +10,6 @@ import "GUI5_ManualDroneControl/cameraview" // Manual Drone Control Tab view Rectangle { color: "#718399" - property bool is_connected: backend.is_connected_prop Row { anchors.fill: parent @@ -62,7 +61,6 @@ Rectangle { MouseArea { anchors.fill: parent onEntered: { - enabled: root.is_connected buttonBackground.color = "white"; buttonText.color = "black"; } @@ -103,7 +101,6 @@ Rectangle { MouseArea { anchors.fill: parent - enabled: root.is_connected onEntered: { upButtonBackground.color = "white"; upButtonText.color = "black"; @@ -179,7 +176,6 @@ Rectangle { MouseArea { anchors.fill: parent - enabled: root.is_connected onEntered: parent.color = "white" onExited: parent.color = "#242c4d" onClicked: backend.getDroneAction("forward") @@ -221,7 +217,6 @@ Rectangle { MouseArea { anchors.fill: parent - enabled: root.is_connected onEntered: parent.color = "white" onExited: parent.color = "#242c4d" onClicked: backend.getDroneAction("turn_left") @@ -254,7 +249,6 @@ Rectangle { MouseArea { anchors.fill: parent - enabled: root.is_connected onEntered: parent.color = "white" onExited: parent.color = "#242c4d" onClicked: backend.getDroneAction("left") @@ -287,7 +281,6 @@ Rectangle { MouseArea { anchors.fill: parent - enabled: root.is_connected onEntered: parent.color = "white" onExited: parent.color = "#242c4d" onClicked: backend.getDroneAction("stream") @@ -320,7 +313,6 @@ Rectangle { MouseArea { anchors.fill: parent - enabled: root.is_connected onEntered: parent.color = "white" onExited: parent.color = "#242c4d" onClicked: backend.getDroneAction("right") @@ -353,7 +345,6 @@ Rectangle { MouseArea { anchors.fill: parent - enabled: root.is_connected onEntered: parent.color = "white" onExited: parent.color = "#242c4d" onClicked: backend.getDroneAction("turn_right") @@ -395,7 +386,6 @@ Rectangle { MouseArea { anchors.fill: parent - enabled: root.is_connected onEntered: parent.color = "white" onExited: parent.color = "#242c4d" onClicked: backend.getDroneAction("backward") @@ -442,7 +432,6 @@ Rectangle { MouseArea { anchors.fill: parent - enabled: !root.is_connected onEntered: parent.color = "white" onExited: parent.color = "#242c4d" onClicked: backend.getDroneAction("connect") @@ -475,7 +464,6 @@ Rectangle { MouseArea { anchors.fill: parent - enabled: root.is_connected onEntered: parent.color = "white" onExited: parent.color = "#242c4d" onClicked: backend.getDroneAction("down") @@ -508,7 +496,6 @@ Rectangle { MouseArea { anchors.fill: parent - enabled: root.is_connected onEntered: parent.color = "white" onExited: parent.color = "#242c4d" onClicked: backend.getDroneAction("takeoff") @@ -541,7 +528,6 @@ Rectangle { MouseArea { anchors.fill: parent - enabled: root.is_connected onEntered: parent.color = "white" onExited: parent.color = "#242c4d" onClicked: backend.getDroneAction("land")