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
44b4595a
Commit
44b4595a
authored
Sep 11, 2017
by
Don Gagne
Committed by
GitHub
Sep 11, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5642 from DonLakeFlyer/DescentRate
Fixed Wing Landing Pattern: Descent rate changes
parents
0ce70271
19f7306b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
9 deletions
+17
-9
FWLandingPattern.FactMetaData.json
src/MissionManager/FWLandingPattern.FactMetaData.json
+2
-2
FixedWingLandingComplexItem.cc
src/MissionManager/FixedWingLandingComplexItem.cc
+1
-1
FWLandingPatternEditor.qml
src/PlanView/FWLandingPatternEditor.qml
+14
-6
No files found.
src/MissionManager/FWLandingPattern.FactMetaData.json
View file @
44b4595a
...
...
@@ -44,8 +44,8 @@
"defaultValue"
:
0.0
},
{
"name"
:
"
Fall
rate"
,
"shortDescription"
:
"
Fall
rate between landing and loiter altitude."
,
"name"
:
"
Descent
rate"
,
"shortDescription"
:
"
Descent
rate between landing and loiter altitude."
,
"type"
:
"double"
,
"units"
:
"%"
,
"min"
:
0.1
,
...
...
src/MissionManager/FixedWingLandingComplexItem.cc
View file @
44b4595a
...
...
@@ -25,7 +25,7 @@ const char* FixedWingLandingComplexItem::_landingHeadingName = "Landing
const
char
*
FixedWingLandingComplexItem
::
_loiterAltitudeName
=
"Loiter altitude"
;
const
char
*
FixedWingLandingComplexItem
::
_loiterRadiusName
=
"Loiter radius"
;
const
char
*
FixedWingLandingComplexItem
::
_landingAltitudeName
=
"Landing altitude"
;
const
char
*
FixedWingLandingComplexItem
::
_fallRateName
=
"
Fall
rate"
;
const
char
*
FixedWingLandingComplexItem
::
_fallRateName
=
"
Descent
rate"
;
const
char
*
FixedWingLandingComplexItem
::
_jsonLoiterCoordinateKey
=
"loiterCoordinate"
;
const
char
*
FixedWingLandingComplexItem
::
_jsonLoiterRadiusKey
=
"loiterRadius"
;
...
...
src/PlanView/FWLandingPatternEditor.qml
View file @
44b4595a
...
...
@@ -77,17 +77,25 @@ Rectangle {
Item
{
width
:
1
;
height
:
_spacer
}
FactTextFieldGrid
{
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
factList
:
[
missionItem
.
landingHeading
,
missionItem
.
landingAltitude
]
}
GridLayout
{
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
columns
:
2
QGCLabel
{
text
:
missionItem
.
landingHeading
.
name
}
FactTextField
{
Layout.fillWidth
:
true
fact
:
missionItem
.
landingHeading
}
QGCLabel
{
text
:
missionItem
.
landingAltitude
.
name
}
FactTextField
{
Layout.fillWidth
:
true
fact
:
missionItem
.
landingAltitude
}
QGCRadioButton
{
id
:
useLandingDistance
text
:
missionItem
.
landingDistance
.
name
...
...
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