Commit 1f8136b7 authored by Don Gagne's avatar Don Gagne

Merge pull request #2416 from DonLakeFlyer/SafetyFix

Fix missin Safety Config warnings
parents 27461b23 215b198a
...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment