Commit 0a815248 authored by dogmaphobic's avatar dogmaphobic

Removing CW/CCW Legend

parent 6e6bf4cc
......@@ -57,7 +57,6 @@
<file alias="QGroundControl/Controls/MissionItemStatus.qml">src/MissionEditor/MissionItemStatus.qml</file>
<file alias="QGroundControl/Controls/MissionCommandDialog.qml">src/QmlControls/MissionCommandDialog.qml</file>
<file alias="QGroundControl/Controls/MultiRotorMotorDisplay.qml">src/QmlControls/MultiRotorMotorDisplay.qml</file>
<file alias="QGroundControl/Controls/MultiRotorMotorDisplayLegend.qml">src/QmlControls/MultiRotorMotorDisplayLegend.qml</file>
<file alias="QGroundControl/Controls/ModeSwitchDisplay.qml">src/QmlControls/ModeSwitchDisplay.qml</file>
<file alias="QGroundControl/Controls/ParameterEditor.qml">src/QmlControls/ParameterEditor.qml</file>
<file alias="QGroundControl/Controls/ParameterEditorDialog.qml">src/QmlControls/ParameterEditorDialog.qml</file>
......
......@@ -106,11 +106,6 @@ SetupPage {
coaxial: controller.vehicle.coaxialMotors
}
MultiRotorMotorDisplayLegend {
anchors.top: parent.top
anchors.bottom: parent.bottom
width: height
}
} // Row
QGCLabel {
......
import QtQuick 2.2
import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0
Item {
id: legendRoot
property var _qgcPal: QGCPalette { colorGroupEnabled: enabled }
property real _rotorRadius: legendRoot.height / 16
readonly property string _cwColor: "#15ce15" // Green
readonly property string _ccwColor: "#1283e0" // Blue
Item {
id: cwItem
anchors.left: parent.left
anchors.right: parent.right
height: legendRoot.height / 2
Rectangle {
id: cwRotor
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
width: _rotorRadius * 2
height: _rotorRadius * 2
radius: _rotorRadius
color: _cwColor
}
QGCLabel {
anchors.leftMargin: ScreenTools.defaultFontPixelWidth
anchors.left: cwRotor.right
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap
text: qsTr("Clockwise rotation, use pusher propeller")
}
}
Item {
id: ccwItem
anchors.top: cwItem.bottom
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
Rectangle {
id: ccwRotor
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
width: _rotorRadius * 2
height: _rotorRadius * 2
radius: _rotorRadius
color: _ccwColor
}
QGCLabel {
anchors.leftMargin: ScreenTools.defaultFontPixelWidth
anchors.left: ccwRotor.right
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap
text: qsTr("Counter Clockwise rotation, use normal propeller")
}
}
} // Item
......@@ -14,7 +14,6 @@ MissionItemIndexLabel 1.0 MissionItemIndexLabel.qml
MissionItemStatus 1.0 MissionItemStatus.qml
ModeSwitchDisplay 1.0 ModeSwitchDisplay.qml
MultiRotorMotorDisplay 1.0 MultiRotorMotorDisplay.qml
MultiRotorMotorDisplayLegend 1.0 MultiRotorMotorDisplayLegend.qml
ParameterEditor 1.0 ParameterEditor.qml
ParameterEditorDialog 1.0 ParameterEditorDialog.qml
RCChannelMonitor 1.0 RCChannelMonitor.qml
......
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