Skip to content

Commit

Permalink
rearranging Viewer3D qml files and adding cmakeList for each qml dire…
Browse files Browse the repository at this point in the history 
…ctory, Viewer3D RTL bug fixed
  • Loading branch information
@omid-esrafilian
omid-esrafilian committed Mar 10, 2024
1 parent fab92b6 commit 0c38a40
Show file tree
Hide file tree
Showing 42 changed files with 77 additions and 40 deletions.
72 changes: 36 additions & 36 deletions qgroundcontrol.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,45 +307,45 @@
<file alias="VirtualJoystick.qml">src/FlightDisplay/VirtualJoystick.qml</file>
<file alias="VTOLLandingPatternEditor.qml">src/PlanView/VTOLLandingPatternEditor.qml</file>
<file alias="QGroundControl/FlightDisplay/FlyViewInsetViewer.qml">src/FlightDisplay/FlyViewInsetViewer.qml</file>
<file alias="Viewer3D/Viewer3D.qml">src/Viewer3D/Viewer3D/Viewer3D.qml</file>
<file alias="Viewer3D/Viewer3D.qml">src/Viewer3D/Viewer3DQml/Viewer3D.qml</file>
<file alias="Viewer3D/qmldir">src/QmlControls/Viewer3D/qmldir</file>
<file alias="Viewer3D/Models3D/CameraLightModel.qml">src/Viewer3D/Viewer3D/Models3D/CameraLightModel.qml</file>
<file alias="Viewer3D/Models3D/Viewer3DModel.qml">src/Viewer3D/Viewer3D/Models3D/Viewer3DModel.qml</file>
<file alias="Viewer3D/Models3D/CameraLightModel.qml">src/Viewer3D/Viewer3DQml/Models3D/CameraLightModel.qml</file>
<file alias="Viewer3D/Models3D/Viewer3DModel.qml">src/Viewer3D/Viewer3DQml/Models3D/Viewer3DModel.qml</file>
<file alias="Viewer3D/Models3D/qmldir">src/QmlControls/Viewer3D/Models3D/qmldir</file>
<file alias="Viewer3D/Models3D/Drones/DroneModelDjiF450.qml">src/Viewer3D/Viewer3D/Models3D/Drones/DroneModelDjiF450.qml</file>
<file alias="Viewer3D/Models3D/Drones/DroneModelDjiF450.qml">src/Viewer3D/Viewer3DQml/Drones/DroneModelDjiF450.qml</file>
<file alias="Viewer3D/Models3D/Drones/qmldir">src/QmlControls/Viewer3D/Models3D/Drones/qmldir</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_1/node.mesh">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_1/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_1/DroneModel_arm_1.qml">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_1/DroneModel_arm_1.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_2/node.mesh">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_2/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_2/DroneModel_arm_2.qml">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_2/DroneModel_arm_2.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_3/node.mesh">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_3/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_3/DroneModel_arm_3.qml">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_3/DroneModel_arm_3.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_4/node.mesh">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_4/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_4/DroneModel_arm_4.qml">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_4/DroneModel_arm_4.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_1/node.mesh">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_1/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_1/DroneModel_BLDC_1.qml">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_1/DroneModel_BLDC_1.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_2/node.mesh">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_2/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_2/DroneModel_BLDC_2.qml">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_2/DroneModel_BLDC_2.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_3/node.mesh">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_3/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_3/DroneModel_BLDC_3.qml">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_3/DroneModel_BLDC_3.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_4/node.mesh">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_4/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_4/DroneModel_BLDC_4.qml">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_4/DroneModel_BLDC_4.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_2/node.mesh">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_2/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_2/DroneModel_propeller2_2.qml">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_2/DroneModel_propeller2_2.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_7/node.mesh">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_7/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_7/DroneModel_propeller2_7.qml">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_7/DroneModel_propeller2_7.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_1/node.mesh">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_1/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_1/DroneModel_propeller22_1.qml">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_1/DroneModel_propeller22_1.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_2/node.mesh">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_2/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_2/DroneModel_propeller22_2.qml">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_2/DroneModel_propeller22_2.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_bottom_1/node.mesh">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_bottom_1/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_bottom_1/DroneModel_Base_bottom_1.qml">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_bottom_1/DroneModel_Base_bottom_1.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_Top_1/node.mesh">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_Top_1/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_Top_1/DroneModel_Base_Top_1.qml">src/Viewer3D/Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_Top_1/DroneModel_Base_Top_1.qml</file>
<file alias="Viewer3D/Models3D/Waypoint3DModel.qml">src/Viewer3D/Viewer3D/Models3D/Waypoint3DModel.qml</file>
<file alias="Viewer3D/Models3D/Line3D.qml">src/Viewer3D/Viewer3D/Models3D/Line3D.qml</file>
<file alias="Viewer3D/Models3D/Viewer3DVehicleItems.qml">src/Viewer3D/Viewer3D/Models3D/Viewer3DVehicleItems.qml</file>
<file alias="Viewer3D/Viewer3DProgressBar.qml">src/Viewer3D/Viewer3D/Viewer3DProgressBar.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_1/node.mesh">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_1/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_1/DroneModel_arm_1.qml">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_1/DroneModel_arm_1.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_2/node.mesh">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_2/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_2/DroneModel_arm_2.qml">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_2/DroneModel_arm_2.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_3/node.mesh">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_3/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_3/DroneModel_arm_3.qml">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_3/DroneModel_arm_3.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_4/node.mesh">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_4/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_arm_4/DroneModel_arm_4.qml">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_arm_4/DroneModel_arm_4.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_1/node.mesh">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_1/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_1/DroneModel_BLDC_1.qml">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_1/DroneModel_BLDC_1.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_2/node.mesh">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_2/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_2/DroneModel_BLDC_2.qml">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_2/DroneModel_BLDC_2.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_3/node.mesh">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_3/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_3/DroneModel_BLDC_3.qml">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_3/DroneModel_BLDC_3.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_4/node.mesh">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_4/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_BLDC_4/DroneModel_BLDC_4.qml">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_BLDC_4/DroneModel_BLDC_4.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_2/node.mesh">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_2/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_2/DroneModel_propeller2_2.qml">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_2/DroneModel_propeller2_2.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_7/node.mesh">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_7/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller2_7/DroneModel_propeller2_7.qml">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller2_7/DroneModel_propeller2_7.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_1/node.mesh">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_1/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_1/DroneModel_propeller22_1.qml">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_1/DroneModel_propeller22_1.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_2/node.mesh">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_2/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_propeller22_2/DroneModel_propeller22_2.qml">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_propeller22_2/DroneModel_propeller22_2.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_bottom_1/node.mesh">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_bottom_1/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_bottom_1/DroneModel_Base_bottom_1.qml">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_bottom_1/DroneModel_Base_bottom_1.qml</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_Top_1/node.mesh">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_Top_1/node.mesh</file>
<file alias="Viewer3D/Models3D/Drones/Djif450/DroneModel_Base_Top_1/DroneModel_Base_Top_1.qml">src/Viewer3D/Viewer3DQml/Drones/Djif450/DroneModel_Base_Top_1/DroneModel_Base_Top_1.qml</file>
<file alias="Viewer3D/Models3D/Waypoint3DModel.qml">src/Viewer3D/Viewer3DQml/Models3D/Waypoint3DModel.qml</file>
<file alias="Viewer3D/Models3D/Line3D.qml">src/Viewer3D/Viewer3DQml/Models3D/Line3D.qml</file>
<file alias="Viewer3D/Models3D/Viewer3DVehicleItems.qml">src/Viewer3D/Viewer3DQml/Models3D/Viewer3DVehicleItems.qml</file>
<file alias="Viewer3D/Viewer3DProgressBar.qml">src/Viewer3D/Viewer3DQml/Viewer3DProgressBar.qml</file>
</qresource>
<qresource prefix="/FirstRunPromptDialogs">
<file alias="UnitsFirstRunPrompt.qml">src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml</file>
Expand Down
1 change: 1 addition & 0 deletions src/Viewer3D/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
add_subdirectory(Viewer3DQml)

qt_add_library(Viewer3D STATIC
CityMapGeometry.cc
Expand Down
9 changes: 9 additions & 0 deletions src/Viewer3D/Viewer3DQml/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
add_subdirectory(Models3D)
add_subdirectory(Drones)

add_custom_target(Viewer3DQml
SOURCES
Viewer3D.qml
Viewer3DProgressBar.qml
)

5 changes: 5 additions & 0 deletions src/Viewer3D/Viewer3DQml/Drones/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
add_custom_target(Drones
SOURCES
DroneModelDjiF450.qml
)

0 ...0/DroneModel_BLDC_1/DroneModel_BLDC_1.qml → ...0/DroneModel_BLDC_1/DroneModel_BLDC_1.qml
View file
File renamed without changes.
0 ...rones/Djif450/DroneModel_BLDC_1/node.mesh → ...rones/Djif450/DroneModel_BLDC_1/node.mesh
View file
File renamed without changes.
0 ...0/DroneModel_BLDC_2/DroneModel_BLDC_2.qml → ...0/DroneModel_BLDC_2/DroneModel_BLDC_2.qml
View file
File renamed without changes.
0 ...rones/Djif450/DroneModel_BLDC_2/node.mesh → ...rones/Djif450/DroneModel_BLDC_2/node.mesh
View file
File renamed without changes.
0 ...0/DroneModel_BLDC_3/DroneModel_BLDC_3.qml → ...0/DroneModel_BLDC_3/DroneModel_BLDC_3.qml
View file
File renamed without changes.
0 ...rones/Djif450/DroneModel_BLDC_3/node.mesh → ...rones/Djif450/DroneModel_BLDC_3/node.mesh
View file
File renamed without changes.
0 ...0/DroneModel_BLDC_4/DroneModel_BLDC_4.qml → ...0/DroneModel_BLDC_4/DroneModel_BLDC_4.qml
View file
File renamed without changes.
0 ...rones/Djif450/DroneModel_BLDC_4/node.mesh → ...rones/Djif450/DroneModel_BLDC_4/node.mesh
View file
File renamed without changes.
0 ...odel_Base_Top_1/DroneModel_Base_Top_1.qml → ...odel_Base_Top_1/DroneModel_Base_Top_1.qml
View file
File renamed without changes.
0 ...s/Djif450/DroneModel_Base_Top_1/node.mesh → ...s/Djif450/DroneModel_Base_Top_1/node.mesh
View file
File renamed without changes.
0 ...ase_bottom_1/DroneModel_Base_bottom_1.qml → ...ase_bottom_1/DroneModel_Base_bottom_1.qml
View file
File renamed without changes.
0 ...jif450/DroneModel_Base_bottom_1/node.mesh → ...jif450/DroneModel_Base_bottom_1/node.mesh
View file
File renamed without changes.
0 ...450/DroneModel_arm_1/DroneModel_arm_1.qml → ...450/DroneModel_arm_1/DroneModel_arm_1.qml
View file
File renamed without changes.
0 ...Djif450/DroneModel_arm_1/meshes/node.mesh → ...Djif450/DroneModel_arm_1/meshes/node.mesh
View file
File renamed without changes.
0 ...Drones/Djif450/DroneModel_arm_1/node.mesh → ...Drones/Djif450/DroneModel_arm_1/node.mesh
View file
File renamed without changes.
0 ...450/DroneModel_arm_2/DroneModel_arm_2.qml → ...450/DroneModel_arm_2/DroneModel_arm_2.qml
View file
File renamed without changes.
0 ...Drones/Djif450/DroneModel_arm_2/node.mesh → ...Drones/Djif450/DroneModel_arm_2/node.mesh
View file
File renamed without changes.
0 ...450/DroneModel_arm_3/DroneModel_arm_3.qml → ...450/DroneModel_arm_3/DroneModel_arm_3.qml
View file
File renamed without changes.
0 ...Drones/Djif450/DroneModel_arm_3/node.mesh → ...Drones/Djif450/DroneModel_arm_3/node.mesh
View file
File renamed without changes.
0 ...450/DroneModel_arm_4/DroneModel_arm_4.qml → ...450/DroneModel_arm_4/DroneModel_arm_4.qml
View file
File renamed without changes.
0 ...Drones/Djif450/DroneModel_arm_4/node.mesh → ...Drones/Djif450/DroneModel_arm_4/node.mesh
View file
File renamed without changes.
0 ...ropeller22_1/DroneModel_propeller22_1.qml → ...ropeller22_1/DroneModel_propeller22_1.qml
View file
File renamed without changes.
0 ...jif450/DroneModel_propeller22_1/node.mesh → ...jif450/DroneModel_propeller22_1/node.mesh
View file
File renamed without changes.
0 ...ropeller22_2/DroneModel_propeller22_2.qml → ...ropeller22_2/DroneModel_propeller22_2.qml
View file
File renamed without changes.
0 ...jif450/DroneModel_propeller22_2/node.mesh → ...jif450/DroneModel_propeller22_2/node.mesh
View file
File renamed without changes.
0 ..._propeller2_2/DroneModel_propeller2_2.qml → ..._propeller2_2/DroneModel_propeller2_2.qml
View file
File renamed without changes.
0 ...Djif450/DroneModel_propeller2_2/node.mesh → ...Djif450/DroneModel_propeller2_2/node.mesh
View file
File renamed without changes.
0 ..._propeller2_7/DroneModel_propeller2_7.qml → ..._propeller2_7/DroneModel_propeller2_7.qml
View file
File renamed without changes.
0 ...Djif450/DroneModel_propeller2_7/node.mesh → ...Djif450/DroneModel_propeller2_7/node.mesh
View file
File renamed without changes.
0 ...r3D/Models3D/Drones/DroneModelDjiF450.qml → .../Viewer3DQml/Drones/DroneModelDjiF450.qml
View file
File renamed without changes.
9 changes: 9 additions & 0 deletions src/Viewer3D/Viewer3DQml/Models3D/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
add_custom_target(Models3D
SOURCES
CameraLightModel.qml
Line3D.qml
Viewer3DModel.qml
Viewer3DVehicleItems.qml
Waypoint3DModel.qml
)

0 ...3D/Viewer3D/Models3D/CameraLightModel.qml → ...Viewer3DQml/Models3D/CameraLightModel.qml
View file
File renamed without changes.
0 src/Viewer3D/Viewer3D/Models3D/Line3D.qml → src/Viewer3D/Viewer3DQml/Models3D/Line3D.qml
View file
File renamed without changes.
0 ...wer3D/Viewer3D/Models3D/Viewer3DModel.qml → ...3D/Viewer3DQml/Models3D/Viewer3DModel.qml
View file
File renamed without changes.
21 changes: 17 additions & 4 deletions ...iewer3D/Models3D/Viewer3DVehicleItems.qml → ...er3DQml/Models3D/Viewer3DVehicleItems.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand Down Expand Up @@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -208,4 +211,14 @@ Node {

}
}

Connections {
target: _vehicle
onHomePositionChanged: {
if(_rtlActive){
addMissionItemsToListModel()
addSegmentToMissionPathModel()
}
}
}
}
0 ...r3D/Viewer3D/Models3D/Waypoint3DModel.qml → .../Viewer3DQml/Models3D/Waypoint3DModel.qml
View file
File renamed without changes.
0 src/Viewer3D/Viewer3D/Viewer3D.qml → src/Viewer3D/Viewer3DQml/Viewer3D.qml
View file
File renamed without changes.
0 ...Viewer3D/Viewer3D/Viewer3DProgressBar.qml → ...wer3D/Viewer3DQml/Viewer3DProgressBar.qml
View file
File renamed without changes.

0 comments on commit 0c38a40

Please sign in to comment.