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
1f8136b7
Commit
1f8136b7
authored
Dec 16, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2416 from DonLakeFlyer/SafetyFix
Fix missin Safety Config warnings
parents
27461b23
215b198a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
16 deletions
+29
-16
SafetyComponent.qml
src/AutoPilotPlugins/PX4/SafetyComponent.qml
+29
-16
No files found.
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @
1f8136b7
...
@@ -56,7 +56,7 @@ QGCView {
...
@@ -56,7 +56,7 @@ QGCView {
Flickable
{
Flickable
{
clip
:
true
clip
:
true
anchors.fill
:
parent
anchors.fill
:
parent
contentHeight
:
7000
//rtlSettings
.height
contentHeight
:
screenBottom
.
y
+
screenBottom
.
height
contentWidth
:
parent
.
width
contentWidth
:
parent
.
width
boundsBehavior
:
Flickable
.
StopAtBounds
boundsBehavior
:
Flickable
.
StopAtBounds
flickableDirection
:
Flickable
.
VerticalFlick
flickableDirection
:
Flickable
.
VerticalFlick
...
@@ -287,9 +287,12 @@ QGCView {
...
@@ -287,9 +287,12 @@ QGCView {
}
}
}
}
/*
QGCLabel
{
QGCLabel
{
width: parent.width
id
:
navRclObc
anchors.topMargin
:
_margins
anchors.top
:
rtlSettings
.
bottom
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
font.pixelSize
:
ScreenTools
.
mediumFontPixelSize
font.pixelSize
:
ScreenTools
.
mediumFontPixelSize
text
:
"
Warning: You have an advanced safety configuration set using the NAV_RCL_OBC parameter. The above settings may not apply.
"
;
text
:
"
Warning: You have an advanced safety configuration set using the NAV_RCL_OBC parameter. The above settings may not apply.
"
;
visible
:
fact
.
value
!==
0
visible
:
fact
.
value
!==
0
...
@@ -299,7 +302,11 @@ QGCView {
...
@@ -299,7 +302,11 @@ QGCView {
}
}
QGCLabel
{
QGCLabel
{
width: parent.width
id
:
navDllObc
anchors.topMargin
:
_margins
/
2
anchors.top
:
navRclObc
.
bottom
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
font.pixelSize
:
ScreenTools
.
mediumFontPixelSize
font.pixelSize
:
ScreenTools
.
mediumFontPixelSize
text
:
"
Warning: You have an advanced safety configuration set using the NAV_DLL_OBC parameter. The above settings may not apply.
"
;
text
:
"
Warning: You have an advanced safety configuration set using the NAV_DLL_OBC parameter. The above settings may not apply.
"
;
visible
:
fact
.
value
!==
0
visible
:
fact
.
value
!==
0
...
@@ -307,7 +314,13 @@ QGCView {
...
@@ -307,7 +314,13 @@ QGCView {
property
Fact
fact
:
controller
.
getParameterFact
(
-
1
,
"
NAV_DLL_OBC
"
)
property
Fact
fact
:
controller
.
getParameterFact
(
-
1
,
"
NAV_DLL_OBC
"
)
}
}
*/
Item
{
id
:
screenBottom
anchors.top
:
navDllObc
.
bottom
width
:
1
height
:
1
}
}
// Flickable
}
// Flickable
}
// QGCViewPanel
}
// QGCViewPanel
}
// QGCView
}
// QGCView
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