Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
472b2acf
Commit
472b2acf
authored
May 07, 2020
by
Remek Zajac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
review comment
parent
82b92297
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
12 deletions
+8
-12
MissionController.cc
src/MissionManager/MissionController.cc
+2
-3
PlanView.SettingsGroup.json
src/Settings/PlanView.SettingsGroup.json
+4
-7
PlanViewSettings.cc
src/Settings/PlanViewSettings.cc
+1
-1
PlanViewSettings.h
src/Settings/PlanViewSettings.h
+1
-1
No files found.
src/MissionManager/MissionController.cc
View file @
472b2acf
...
...
@@ -1464,7 +1464,6 @@ void MissionController::_recalcMissionFlightStatus()
bool
foundRTL
=
false
;
bool
vehicleYawSpecificallySet
=
false
;
double
totalHorizontalDistance
=
0
;
bool
showGimbalOnlyWhenSet
=
_planViewSettings
->
showGimbalWhen
()
->
enumStringValue
()
==
"Set"
;
for
(
int
i
=
0
;
i
<
_visualItems
->
count
();
i
++
)
{
VisualMissionItem
*
item
=
qobject_cast
<
VisualMissionItem
*>
(
_visualItems
->
get
(
i
));
...
...
@@ -1512,11 +1511,11 @@ void MissionController::_recalcMissionFlightStatus()
// Look for specific gimbal changes
double
gimbalYaw
=
item
->
specifiedGimbalYaw
();
if
(
!
qIsNaN
(
gimbalYaw
)
||
showGimbalOnlyWhenSet
)
{
if
(
!
qIsNaN
(
gimbalYaw
)
||
_planViewSettings
->
showGimbalOnlyWhenSet
()
->
rawValue
().
toBool
()
)
{
_missionFlightStatus
.
gimbalYaw
=
gimbalYaw
;
}
double
gimbalPitch
=
item
->
specifiedGimbalPitch
();
if
(
!
qIsNaN
(
gimbalPitch
)
||
showGimbalOnlyWhenSet
)
{
if
(
!
qIsNaN
(
gimbalPitch
)
||
_planViewSettings
->
showGimbalOnlyWhenSet
()
->
rawValue
().
toBool
()
)
{
_missionFlightStatus
.
gimbalPitch
=
gimbalPitch
;
}
...
...
src/Settings/PlanView.SettingsGroup.json
View file @
472b2acf
...
...
@@ -30,12 +30,9 @@
"defaultValue"
:
false
},
{
"name"
:
"showGimbalWhen"
,
"shortDescription"
:
"Show gimbal yaw visual when yaw known/set"
,
"longDescription"
:
"Shows the gimbal yaw when the it's explcitly set by the user or simply when known (propagated from previous)"
,
"type"
:
"uint32"
,
"enumValues"
:
"0,1"
,
"enumStrings"
:
"Known,Set"
,
"defaultValue"
:
0
"name"
:
"showGimbalOnlyWhenSet"
,
"shortDescription"
:
"Show gimbal yaw visual only when set explicitly for the waypoint"
,
"type"
:
"bool"
,
"defaultValue"
:
false
}
]
src/Settings/PlanViewSettings.cc
View file @
472b2acf
...
...
@@ -22,4 +22,4 @@ DECLARE_SETTINGSFACT(PlanViewSettings, aboveTerrainWarning)
DECLARE_SETTINGSFACT
(
PlanViewSettings
,
showMissionItemStatus
)
DECLARE_SETTINGSFACT
(
PlanViewSettings
,
useConditionGate
)
DECLARE_SETTINGSFACT
(
PlanViewSettings
,
takeoffItemNotRequired
)
DECLARE_SETTINGSFACT
(
PlanViewSettings
,
showGimbal
When
)
DECLARE_SETTINGSFACT
(
PlanViewSettings
,
showGimbal
OnlyWhenSet
)
src/Settings/PlanViewSettings.h
View file @
472b2acf
...
...
@@ -25,5 +25,5 @@ public:
DEFINE_SETTINGFACT
(
showMissionItemStatus
)
DEFINE_SETTINGFACT
(
useConditionGate
)
DEFINE_SETTINGFACT
(
takeoffItemNotRequired
)
DEFINE_SETTINGFACT
(
showGimbal
When
)
DEFINE_SETTINGFACT
(
showGimbal
OnlyWhenSet
)
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment