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
359a08f0
Unverified
Commit
359a08f0
authored
Jun 19, 2018
by
Don Gagne
Committed by
GitHub
Jun 19, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6603 from DonLakeFlyer/MoreFixes
More fixes
parents
e4dc651d
435d6d36
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
5 deletions
+13
-5
GuidedActionsController.qml
src/FlightDisplay/GuidedActionsController.qml
+10
-2
MissionItemStatus.qml
src/PlanView/MissionItemStatus.qml
+2
-0
DropPanel.qml
src/QmlControls/DropPanel.qml
+0
-2
MissionItemIndexLabel.qml
src/QmlControls/MissionItemIndexLabel.qml
+1
-1
No files found.
src/FlightDisplay/GuidedActionsController.qml
View file @
359a08f0
...
...
@@ -152,8 +152,16 @@ Item {
on__GuidedModeSupportedChanged
:
_outputState
()
on__PauseVehicleSupportedChanged
:
_outputState
()
on_CurrentMissionIndexChanged
:
console
.
log
(
"
_currentMissionIndex
"
,
_currentMissionIndex
)
on_ResumeMissionIndexChanged
:
console
.
log
(
"
_resumeMissionIndex
"
,
_resumeMissionIndex
)
on_CurrentMissionIndexChanged
:
{
if
(
__debugGuidedStates
)
{
console
.
log
(
"
_currentMissionIndex
"
,
_currentMissionIndex
)
}
}
on_ResumeMissionIndexChanged
:
{
if
(
__debugGuidedStates
)
{
console
.
log
(
"
_resumeMissionIndex
"
,
_resumeMissionIndex
)
}
}
onShowResumeMissionChanged
:
{
if
(
__debugGuidedStates
)
{
console
.
log
(
"
showResumeMission
"
,
showResumeMission
)
...
...
src/PlanView/MissionItemStatus.qml
View file @
359a08f0
...
...
@@ -73,6 +73,7 @@ Rectangle {
visible
:
display
property
real
availableHeight
:
height
-
indicator
.
height
property
bool
_coordValid
:
object
.
coordinate
.
isValid
property
bool
_terrainAvailable
:
!
isNaN
(
object
.
terrainPercent
)
property
real
_terrainPercent
:
_terrainAvailable
?
object
.
terrainPercent
:
1
...
...
@@ -85,6 +86,7 @@ Rectangle {
width
:
indicator
.
width
height
:
_terrainAvailable
?
Math
.
max
(
availableHeight
*
_terrainPercent
,
1
)
:
parent
.
height
color
:
_terrainAvailable
?
(
_terrainPercent
>
object
.
altPercent
?
"
red
"
:
qgcPal
.
text
)
:
"
yellow
"
visible
:
_coordValid
}
MissionItemIndexLabel
{
...
...
src/QmlControls/DropPanel.qml
View file @
359a08f0
...
...
@@ -162,8 +162,6 @@ Item {
Loader
{
id
:
panelLoader
x
:
_dropMargin
y
:
_dropMargin
onHeightChanged
:
_calcPositions
()
onWidthChanged
:
_calcPositions
()
...
...
src/QmlControls/MissionItemIndexLabel.qml
View file @
359a08f0
...
...
@@ -109,7 +109,7 @@ Canvas {
verticalAlignment
:
Text
.
AlignVCenter
color
:
"
white
"
font.pointSize
:
ScreenTools
.
defaultFontPointSize
fontSizeMode
:
Text
.
Horizontal
Fit
fontSizeMode
:
Text
.
Fit
text
:
_index
}
}
...
...
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