Browse Source

Merge pull request #2416 from DonLakeFlyer/SafetyFix

Fix missin Safety Config warnings
QGC4.4
Don Gagne 9 years ago
parent
commit
1f8136b72d
  1. 25
      src/AutoPilotPlugins/PX4/SafetyComponent.qml

25
src/AutoPilotPlugins/PX4/SafetyComponent.qml

@ -56,7 +56,7 @@ QGCView { @@ -56,7 +56,7 @@ QGCView {
Flickable {
clip: true
anchors.fill: parent
contentHeight: 7000 //rtlSettings.height
contentHeight: screenBottom.y + screenBottom.height
contentWidth: parent.width
boundsBehavior: Flickable.StopAtBounds
flickableDirection: Flickable.VerticalFlick
@ -287,9 +287,12 @@ QGCView { @@ -287,9 +287,12 @@ QGCView {
}
}
/*
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
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
@ -299,7 +302,11 @@ QGCView { @@ -299,7 +302,11 @@ QGCView {
}
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
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
@ -307,7 +314,13 @@ QGCView { @@ -307,7 +314,13 @@ QGCView {
property Fact fact: controller.getParameterFact(-1, "NAV_DLL_OBC")
}
*/
Item {
id: screenBottom
anchors.top: navDllObc.bottom
width: 1
height: 1
}
} // Flickable
} // QGCViewPanel
} // QGCView
} // QGCView

Loading…
Cancel
Save