diff --git a/GUI5.py b/GUI5.py index ac0e0679..684707ba 100644 --- a/GUI5.py +++ b/GUI5.py @@ -18,7 +18,7 @@ import contextlib from collections import defaultdict from brainflow.board_shim import BoardShim, BrainFlowInputParams, BoardIds -from GUI5_ManualDroneControl.cameraview.camera_controller import CameraController +from 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 diff --git a/ManualDroneControl.qml b/ManualDroneControl.qml index b1ea0465..4f4b9642 100644 --- a/ManualDroneControl.qml +++ b/ManualDroneControl.qml @@ -5,10 +5,11 @@ import QtQuick.Window 2.15 import QtQuick3D 6.7 import QtQuick.Dialogs import Qt.labs.platform -import "GUI5_ManualDroneControl/cameraview" +import "cameraview" // Manual Drone Control Tab view Rectangle { + id: root color: "#718399" property bool is_connected: backend.is_connected_prop diff --git a/GUI5_ManualDroneControl/cameraview/CameraView.qml b/cameraview/CameraView.qml similarity index 100% rename from GUI5_ManualDroneControl/cameraview/CameraView.qml rename to cameraview/CameraView.qml diff --git a/GUI5_ManualDroneControl/cameraview/__init__.py b/cameraview/__init__.py similarity index 100% rename from GUI5_ManualDroneControl/cameraview/__init__.py rename to cameraview/__init__.py diff --git a/GUI5_ManualDroneControl/cameraview/camera_controller.py b/cameraview/camera_controller.py similarity index 100% rename from GUI5_ManualDroneControl/cameraview/camera_controller.py rename to cameraview/camera_controller.py