Commit 077dd3e3 authored by DoinLakeFlyer's avatar DoinLakeFlyer

Always how command description. Better support for VTOL Takeoff. New help text...

Always how command description. Better support for VTOL Takeoff. New help text for altitude on Land commands.
parent 74f3755e
...@@ -981,6 +981,6 @@ void SimpleMissionItem::_possibleAdditionalTimeDelayChanged(void) ...@@ -981,6 +981,6 @@ void SimpleMissionItem::_possibleAdditionalTimeDelayChanged(void)
bool SimpleMissionItem::isLandCommand(void) const bool SimpleMissionItem::isLandCommand(void) const
{ {
MAV_CMD command = static_cast<MAV_CMD>(this->command()); MAV_CMD command = static_cast<MAV_CMD>(this->command());
const MissionCommandUIInfo* uiInfo = _commandTree->getUIInfo(_vehicle, command); const MissionCommandUIInfo* uiInfo = _commandTree->getUIInfo(_controllerVehicle, command);
return uiInfo->isLandCommand(); return uiInfo->isLandCommand();
} }
...@@ -59,6 +59,16 @@ Rectangle { ...@@ -59,6 +59,16 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
spacing: _margin
QGCLabel {
width: parent.width
wrapMode: Text.WordWrap
font.pointSize: ScreenTools.smallFontPointSize
text: missionItem.rawEdit ?
qsTr("Provides advanced access to all commands/parameters. Be very careful!") :
missionItem.commandDescription
}
ColumnLayout { ColumnLayout {
anchors.left: parent.left anchors.left: parent.left
...@@ -67,7 +77,7 @@ Rectangle { ...@@ -67,7 +77,7 @@ Rectangle {
visible: missionItem.isTakeoffItem && missionItem.wizardMode // Hack special case for takeoff item visible: missionItem.isTakeoffItem && missionItem.wizardMode // Hack special case for takeoff item
QGCLabel { QGCLabel {
text: qsTr("Move 'T' Takeoff to the %1 location.").arg(_controllerVehicle.vtol ? qsTr("desired") : qsTr("climbout")) text: qsTr("Move '%1' Takeoff to the %2 location.").arg(_controllerVehicle.vtol ? qsTr("V") : qsTr("T")).arg(_controllerVehicle.vtol ? qsTr("desired") : qsTr("climbout"))
Layout.fillWidth: true Layout.fillWidth: true
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
visible: !initialClickLabel.visible visible: !initialClickLabel.visible
...@@ -77,7 +87,7 @@ Rectangle { ...@@ -77,7 +87,7 @@ Rectangle {
text: qsTr("Ensure clear of obstacles and into the wind.") text: qsTr("Ensure clear of obstacles and into the wind.")
Layout.fillWidth: true Layout.fillWidth: true
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
visible: !initialClickLabel.visible && !_controllerVehicle.vtol visible: !initialClickLabel.visible
} }
QGCButton { QGCButton {
...@@ -107,15 +117,6 @@ Rectangle { ...@@ -107,15 +117,6 @@ Rectangle {
spacing: _margin spacing: _margin
visible: !missionItem.wizardMode visible: !missionItem.wizardMode
QGCLabel {
width: parent.width
wrapMode: Text.WordWrap
font.pointSize: ScreenTools.smallFontPointSize
text: missionItem.rawEdit ?
qsTr("Provides advanced access to all commands/parameters. Be very careful!") :
missionItem.commandDescription
}
GridLayout { GridLayout {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
...@@ -162,6 +163,14 @@ Rectangle { ...@@ -162,6 +163,14 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
spacing: _margin spacing: _margin
QGCLabel {
width: parent.width
wrapMode: Text.WordWrap
font.pointSize: ScreenTools.smallFontPointSize
text: qsTr("Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.")
visible: missionItem.isLandCommand
}
Item { Item {
width: altHamburger.x + altHamburger.width width: altHamburger.x + altHamburger.width
height: altModeLabel.height height: altModeLabel.height
......
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