From 0c38a40b5cb0976d96e7b2a535fa9c96f285875c Mon Sep 17 00:00:00 2001 From: "esrafilian.omid" Date: Sun, 10 Mar 2024 12:52:32 +0100 Subject: [PATCH] rearranging Viewer3D qml files and adding cmakeList for each qml directory, Viewer3D RTL bug fixed --- qgroundcontrol.qrc | 72 +++++++++--------- src/Viewer3D/CMakeLists.txt | 1 + src/Viewer3D/Viewer3DQml/CMakeLists.txt | 9 +++ .../Viewer3DQml/Drones/CMakeLists.txt | 5 ++ .../DroneModel_BLDC_1/DroneModel_BLDC_1.qml | 0 .../Djif450/DroneModel_BLDC_1/node.mesh | Bin .../DroneModel_BLDC_2/DroneModel_BLDC_2.qml | 0 .../Djif450/DroneModel_BLDC_2/node.mesh | Bin .../DroneModel_BLDC_3/DroneModel_BLDC_3.qml | 0 .../Djif450/DroneModel_BLDC_3/node.mesh | Bin .../DroneModel_BLDC_4/DroneModel_BLDC_4.qml | 0 .../Djif450/DroneModel_BLDC_4/node.mesh | Bin .../DroneModel_Base_Top_1.qml | 0 .../Djif450/DroneModel_Base_Top_1/node.mesh | Bin .../DroneModel_Base_bottom_1.qml | 0 .../DroneModel_Base_bottom_1/node.mesh | Bin .../DroneModel_arm_1/DroneModel_arm_1.qml | 0 .../Djif450/DroneModel_arm_1/meshes/node.mesh | Bin .../Drones/Djif450/DroneModel_arm_1/node.mesh | Bin .../DroneModel_arm_2/DroneModel_arm_2.qml | 0 .../Drones/Djif450/DroneModel_arm_2/node.mesh | Bin .../DroneModel_arm_3/DroneModel_arm_3.qml | 0 .../Drones/Djif450/DroneModel_arm_3/node.mesh | Bin .../DroneModel_arm_4/DroneModel_arm_4.qml | 0 .../Drones/Djif450/DroneModel_arm_4/node.mesh | Bin .../DroneModel_propeller22_1.qml | 0 .../DroneModel_propeller22_1/node.mesh | Bin .../DroneModel_propeller22_2.qml | 0 .../DroneModel_propeller22_2/node.mesh | Bin .../DroneModel_propeller2_2.qml | 0 .../Djif450/DroneModel_propeller2_2/node.mesh | Bin .../DroneModel_propeller2_7.qml | 0 .../Djif450/DroneModel_propeller2_7/node.mesh | Bin .../Drones/DroneModelDjiF450.qml | 0 .../Viewer3DQml/Models3D/CMakeLists.txt | 9 +++ .../Models3D/CameraLightModel.qml | 0 .../Models3D/Line3D.qml | 0 .../Models3D/Viewer3DModel.qml | 0 .../Models3D/Viewer3DVehicleItems.qml | 21 ++++- .../Models3D/Waypoint3DModel.qml | 0 .../{Viewer3D => Viewer3DQml}/Viewer3D.qml | 0 .../Viewer3DProgressBar.qml | 0 42 files changed, 77 insertions(+), 40 deletions(-) create mode 100644 src/Viewer3D/Viewer3DQml/CMakeLists.txt create mode 100644 src/Viewer3D/Viewer3DQml/Drones/CMakeLists.txt rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_BLDC_1/DroneModel_BLDC_1.qml (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_BLDC_1/node.mesh (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_BLDC_2/DroneModel_BLDC_2.qml (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_BLDC_2/node.mesh (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_BLDC_3/DroneModel_BLDC_3.qml (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_BLDC_3/node.mesh (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_BLDC_4/DroneModel_BLDC_4.qml (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_BLDC_4/node.mesh (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_Base_Top_1/DroneModel_Base_Top_1.qml (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_Base_Top_1/node.mesh (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_Base_bottom_1/DroneModel_Base_bottom_1.qml (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_Base_bottom_1/node.mesh (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_arm_1/DroneModel_arm_1.qml (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_arm_1/meshes/node.mesh (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_arm_1/node.mesh (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_arm_2/DroneModel_arm_2.qml (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_arm_2/node.mesh (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_arm_3/DroneModel_arm_3.qml (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_arm_3/node.mesh (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_arm_4/DroneModel_arm_4.qml (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_arm_4/node.mesh (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_propeller22_1/DroneModel_propeller22_1.qml (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_propeller22_1/node.mesh (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_propeller22_2/DroneModel_propeller22_2.qml (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_propeller22_2/node.mesh (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_propeller2_2/DroneModel_propeller2_2.qml (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_propeller2_2/node.mesh (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_propeller2_7/DroneModel_propeller2_7.qml (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/Djif450/DroneModel_propeller2_7/node.mesh (100%) rename src/Viewer3D/{Viewer3D/Models3D => Viewer3DQml}/Drones/DroneModelDjiF450.qml (100%) create mode 100644 src/Viewer3D/Viewer3DQml/Models3D/CMakeLists.txt rename src/Viewer3D/{Viewer3D => Viewer3DQml}/Models3D/CameraLightModel.qml (100%) rename src/Viewer3D/{Viewer3D => Viewer3DQml}/Models3D/Line3D.qml (100%) rename src/Viewer3D/{Viewer3D => Viewer3DQml}/Models3D/Viewer3DModel.qml (100%) rename src/Viewer3D/{Viewer3D => Viewer3DQml}/Models3D/Viewer3DVehicleItems.qml (91%) rename src/Viewer3D/{Viewer3D => Viewer3DQml}/Models3D/Waypoint3DModel.qml (100%) rename src/Viewer3D/{Viewer3D => Viewer3DQml}/Viewer3D.qml (100%) rename src/Viewer3D/{Viewer3D => Viewer3DQml}/Viewer3DProgressBar.qml (100%) diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index 3d09eb17250..82eb5891193 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -307,45 +307,45 @@ src/FlightDisplay/VirtualJoystick.qml src/PlanView/VTOLLandingPatternEditor.qml src/FlightDisplay/FlyViewInsetViewer.qml - src/Viewer3D/Viewer3D/Viewer3D.qml + src/Viewer3D/Viewer3DQml/Viewer3D.qml src/QmlControls/Viewer3D/qmldir - src/Viewer3D/Viewer3D/Models3D/CameraLightModel.qml - src/Viewer3D/Viewer3D/Models3D/Viewer3DModel.qml + src/Viewer3D/Viewer3DQml/Models3D/CameraLightModel.qml + src/Viewer3D/Viewer3DQml/Models3D/Viewer3DModel.qml src/QmlControls/Viewer3D/Models3D/qmldir - src/Viewer3D/Viewer3D/Models3D/Drones/DroneModelDjiF450.qml + src/Viewer3D/Viewer3DQml/Drones/DroneModelDjiF450.qml src/QmlControls/Viewer3D/Models3D/Drones/qmldir - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_1/node.mesh - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_1/DroneModel_arm_1.qml - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_2/node.mesh - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_2/DroneModel_arm_2.qml - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_3/node.mesh - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_3/DroneModel_arm_3.qml - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_4/node.mesh - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_4/DroneModel_arm_4.qml - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_1/node.mesh - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_1/DroneModel_BLDC_1.qml - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_2/node.mesh - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_2/DroneModel_BLDC_2.qml - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_3/node.mesh - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_3/DroneModel_BLDC_3.qml - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_4/node.mesh - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_4/DroneModel_BLDC_4.qml - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_2/node.mesh - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_2/DroneModel_propeller2_2.qml - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_7/node.mesh - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_7/DroneModel_propeller2_7.qml - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_1/node.mesh - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_1/DroneModel_propeller22_1.qml - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_2/node.mesh - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_2/DroneModel_propeller22_2.qml - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_bottom_1/node.mesh - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_bottom_1/DroneModel_Base_bottom_1.qml - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_Top_1/node.mesh - src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_Top_1/DroneModel_Base_Top_1.qml - src/Viewer3D/Viewer3D/Models3D/Waypoint3DModel.qml - src/Viewer3D/Viewer3D/Models3D/Line3D.qml - src/Viewer3D/Viewer3D/Models3D/Viewer3DVehicleItems.qml - src/Viewer3D/Viewer3D/Viewer3DProgressBar.qml + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_1/node.mesh + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_1/DroneModel_arm_1.qml + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_2/node.mesh + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_2/DroneModel_arm_2.qml + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_3/node.mesh + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_3/DroneModel_arm_3.qml + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_4/node.mesh + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_4/DroneModel_arm_4.qml + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_1/node.mesh + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_1/DroneModel_BLDC_1.qml + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_2/node.mesh + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_2/DroneModel_BLDC_2.qml + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_3/node.mesh + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_3/DroneModel_BLDC_3.qml + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_4/node.mesh + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_4/DroneModel_BLDC_4.qml + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_2/node.mesh + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_2/DroneModel_propeller2_2.qml + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_7/node.mesh + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_7/DroneModel_propeller2_7.qml + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_1/node.mesh + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_1/DroneModel_propeller22_1.qml + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_2/node.mesh + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_2/DroneModel_propeller22_2.qml + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_bottom_1/node.mesh + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_bottom_1/DroneModel_Base_bottom_1.qml + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_Top_1/node.mesh + src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_Top_1/DroneModel_Base_Top_1.qml + src/Viewer3D/Viewer3DQml/Models3D/Waypoint3DModel.qml + src/Viewer3D/Viewer3DQml/Models3D/Line3D.qml + src/Viewer3D/Viewer3DQml/Models3D/Viewer3DVehicleItems.qml + src/Viewer3D/Viewer3DQml/Viewer3DProgressBar.qml src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml diff --git a/src/Viewer3D/CMakeLists.txt b/src/Viewer3D/CMakeLists.txt index 47a77a3c35a..3a6ade9f2df 100644 --- a/src/Viewer3D/CMakeLists.txt +++ b/src/Viewer3D/CMakeLists.txt @@ -1,3 +1,4 @@ +add_subdirectory(Viewer3DQml) qt_add_library(Viewer3D STATIC CityMapGeometry.cc diff --git a/src/Viewer3D/Viewer3DQml/CMakeLists.txt b/src/Viewer3D/Viewer3DQml/CMakeLists.txt new file mode 100644 index 00000000000..40c380111b0 --- /dev/null +++ b/src/Viewer3D/Viewer3DQml/CMakeLists.txt @@ -0,0 +1,9 @@ +add_subdirectory(Models3D) +add_subdirectory(Drones) + +add_custom_target(Viewer3DQml + SOURCES + Viewer3D.qml + Viewer3DProgressBar.qml +) + diff --git a/src/Viewer3D/Viewer3DQml/Drones/CMakeLists.txt b/src/Viewer3D/Viewer3DQml/Drones/CMakeLists.txt new file mode 100644 index 00000000000..ea2118def3a --- /dev/null +++ b/src/Viewer3D/Viewer3DQml/Drones/CMakeLists.txt @@ -0,0 +1,5 @@ +add_custom_target(Drones + SOURCES + DroneModelDjiF450.qml +) + diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_1/DroneModel_BLDC_1.qml b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_1/DroneModel_BLDC_1.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_1/DroneModel_BLDC_1.qml rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_1/DroneModel_BLDC_1.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_1/node.mesh b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_1/node.mesh similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_1/node.mesh rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_1/node.mesh diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_2/DroneModel_BLDC_2.qml b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_2/DroneModel_BLDC_2.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_2/DroneModel_BLDC_2.qml rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_2/DroneModel_BLDC_2.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_2/node.mesh b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_2/node.mesh similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_2/node.mesh rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_2/node.mesh diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_3/DroneModel_BLDC_3.qml b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_3/DroneModel_BLDC_3.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_3/DroneModel_BLDC_3.qml rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_3/DroneModel_BLDC_3.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_3/node.mesh b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_3/node.mesh similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_3/node.mesh rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_3/node.mesh diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_4/DroneModel_BLDC_4.qml b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_4/DroneModel_BLDC_4.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_4/DroneModel_BLDC_4.qml rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_4/DroneModel_BLDC_4.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_4/node.mesh b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_4/node.mesh similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_4/node.mesh rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_4/node.mesh diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_Top_1/DroneModel_Base_Top_1.qml b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_Top_1/DroneModel_Base_Top_1.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_Top_1/DroneModel_Base_Top_1.qml rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_Top_1/DroneModel_Base_Top_1.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_Top_1/node.mesh b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_Top_1/node.mesh similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_Top_1/node.mesh rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_Top_1/node.mesh diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_bottom_1/DroneModel_Base_bottom_1.qml b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_bottom_1/DroneModel_Base_bottom_1.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_bottom_1/DroneModel_Base_bottom_1.qml rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_bottom_1/DroneModel_Base_bottom_1.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_bottom_1/node.mesh b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_bottom_1/node.mesh similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_bottom_1/node.mesh rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_bottom_1/node.mesh diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_1/DroneModel_arm_1.qml b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_1/DroneModel_arm_1.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_1/DroneModel_arm_1.qml rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_1/DroneModel_arm_1.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_1/meshes/node.mesh b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_1/meshes/node.mesh similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_1/meshes/node.mesh rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_1/meshes/node.mesh diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_1/node.mesh b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_1/node.mesh similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_1/node.mesh rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_1/node.mesh diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_2/DroneModel_arm_2.qml b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_2/DroneModel_arm_2.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_2/DroneModel_arm_2.qml rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_2/DroneModel_arm_2.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_2/node.mesh b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_2/node.mesh similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_2/node.mesh rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_2/node.mesh diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_3/DroneModel_arm_3.qml b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_3/DroneModel_arm_3.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_3/DroneModel_arm_3.qml rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_3/DroneModel_arm_3.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_3/node.mesh b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_3/node.mesh similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_3/node.mesh rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_3/node.mesh diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_4/DroneModel_arm_4.qml b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_4/DroneModel_arm_4.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_4/DroneModel_arm_4.qml rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_4/DroneModel_arm_4.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_4/node.mesh b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_4/node.mesh similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_4/node.mesh rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_4/node.mesh diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_1/DroneModel_propeller22_1.qml b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_1/DroneModel_propeller22_1.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_1/DroneModel_propeller22_1.qml rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_1/DroneModel_propeller22_1.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_1/node.mesh b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_1/node.mesh similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_1/node.mesh rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_1/node.mesh diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_2/DroneModel_propeller22_2.qml b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_2/DroneModel_propeller22_2.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_2/DroneModel_propeller22_2.qml rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_2/DroneModel_propeller22_2.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_2/node.mesh b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_2/node.mesh similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_2/node.mesh rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_2/node.mesh diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_2/DroneModel_propeller2_2.qml b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_2/DroneModel_propeller2_2.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_2/DroneModel_propeller2_2.qml rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_2/DroneModel_propeller2_2.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_2/node.mesh b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_2/node.mesh similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_2/node.mesh rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_2/node.mesh diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_7/DroneModel_propeller2_7.qml b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_7/DroneModel_propeller2_7.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_7/DroneModel_propeller2_7.qml rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_7/DroneModel_propeller2_7.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_7/node.mesh b/src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_7/node.mesh similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_7/node.mesh rename to src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_7/node.mesh diff --git a/src/Viewer3D/Viewer3D/Models3D/Drones/DroneModelDjiF450.qml b/src/Viewer3D/Viewer3DQml/Drones/DroneModelDjiF450.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Drones/DroneModelDjiF450.qml rename to src/Viewer3D/Viewer3DQml/Drones/DroneModelDjiF450.qml diff --git a/src/Viewer3D/Viewer3DQml/Models3D/CMakeLists.txt b/src/Viewer3D/Viewer3DQml/Models3D/CMakeLists.txt new file mode 100644 index 00000000000..92f2f01a257 --- /dev/null +++ b/src/Viewer3D/Viewer3DQml/Models3D/CMakeLists.txt @@ -0,0 +1,9 @@ +add_custom_target(Models3D + SOURCES + CameraLightModel.qml + Line3D.qml + Viewer3DModel.qml + Viewer3DVehicleItems.qml + Waypoint3DModel.qml +) + diff --git a/src/Viewer3D/Viewer3D/Models3D/CameraLightModel.qml b/src/Viewer3D/Viewer3DQml/Models3D/CameraLightModel.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/CameraLightModel.qml rename to src/Viewer3D/Viewer3DQml/Models3D/CameraLightModel.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Line3D.qml b/src/Viewer3D/Viewer3DQml/Models3D/Line3D.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Line3D.qml rename to src/Viewer3D/Viewer3DQml/Models3D/Line3D.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Viewer3DModel.qml b/src/Viewer3D/Viewer3DQml/Models3D/Viewer3DModel.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Viewer3DModel.qml rename to src/Viewer3D/Viewer3DQml/Models3D/Viewer3DModel.qml diff --git a/src/Viewer3D/Viewer3D/Models3D/Viewer3DVehicleItems.qml b/src/Viewer3D/Viewer3DQml/Models3D/Viewer3DVehicleItems.qml similarity index 91% rename from src/Viewer3D/Viewer3D/Models3D/Viewer3DVehicleItems.qml rename to src/Viewer3D/Viewer3DQml/Models3D/Viewer3DVehicleItems.qml index bbe17264720..8f3adcfc55e 100644 --- a/src/Viewer3D/Viewer3D/Models3D/Viewer3DVehicleItems.qml +++ b/src/Viewer3D/Viewer3DQml/Models3D/Viewer3DVehicleItems.qml @@ -25,6 +25,7 @@ Node { property var _missionController: (_planMasterController)?(_planMasterController.missionController):(null) property var _viewer3DSetting: QGroundControl.settingsManager.viewer3DSettings property var _altitudeBias: _viewer3DSetting.altitudeBias.rawValue + property bool _rtlActive: false function isItemAcceptable(missionItem){ @@ -67,8 +68,9 @@ Node { function addMissionItemsToListModel() { missionWaypointListModel.clear() var _geo2EnuCopy = goe2Enu - var launchItemCoordinate; - var _missionItemPrevious; + var launchItemCoordinate = null; + var _missionItemPrevious = null; + _rtlActive = false; for (var i = 0; i < _missionController.visualItems.count; i++) { var _missionItem = _missionController.visualItems.get(i); // list of all properties in VisualMissionItem.h and SimpleMissionItem.h @@ -78,7 +80,8 @@ Node { } if(isItemAcceptable(_missionItem)){ if(isReturnToLaunchItem(_missionItem)){ - _geo2EnuCopy.coordinate = launchItemCoordinate; + _rtlActive = true; + _geo2EnuCopy.coordinate = (_vehicle.homePosition)?(_vehicle.homePosition):(_missionItem.coordinate); _geo2EnuCopy.coordinate.altitude = _missionItemPrevious.altitude.value; }else{ _geo2EnuCopy.coordinate = _missionItem.coordinate; @@ -125,7 +128,7 @@ Node { var p1 = Qt.vector3d(_geo2EnuCopy.localCoordinate.x, _geo2EnuCopy.localCoordinate.y, _geo2EnuCopy.coordinate.altitude); if(isReturnToLaunchItem(_missionItem)){ - _geo2EnuCopy.coordinate = launchItemCoordinate; + _geo2EnuCopy.coordinate = (_vehicle.homePosition)?(_vehicle.homePosition):(_missionItem.coordinate);; _geo2EnuCopy.coordinate.altitude = _missionItemPrevious.altitude.value; }else{ _geo2EnuCopy.coordinate = _missionItem.coordinate; @@ -208,4 +211,14 @@ Node { } } + + Connections { + target: _vehicle + onHomePositionChanged: { + if(_rtlActive){ + addMissionItemsToListModel() + addSegmentToMissionPathModel() + } + } + } } diff --git a/src/Viewer3D/Viewer3D/Models3D/Waypoint3DModel.qml b/src/Viewer3D/Viewer3DQml/Models3D/Waypoint3DModel.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Models3D/Waypoint3DModel.qml rename to src/Viewer3D/Viewer3DQml/Models3D/Waypoint3DModel.qml diff --git a/src/Viewer3D/Viewer3D/Viewer3D.qml b/src/Viewer3D/Viewer3DQml/Viewer3D.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Viewer3D.qml rename to src/Viewer3D/Viewer3DQml/Viewer3D.qml diff --git a/src/Viewer3D/Viewer3D/Viewer3DProgressBar.qml b/src/Viewer3D/Viewer3DQml/Viewer3DProgressBar.qml similarity index 100% rename from src/Viewer3D/Viewer3D/Viewer3DProgressBar.qml rename to src/Viewer3D/Viewer3DQml/Viewer3DProgressBar.qml