diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index 0f6a054fd82e742c3fce791c4f65f68d7aa94ee0..1c2b007821f4d6d761863be9b8ac03e3043dac0d 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -57,7 +57,6 @@ src/MissionEditor/MissionItemStatus.qml src/QmlControls/MissionCommandDialog.qml src/QmlControls/MultiRotorMotorDisplay.qml - src/QmlControls/MultiRotorMotorDisplayLegend.qml src/QmlControls/ModeSwitchDisplay.qml src/QmlControls/ParameterEditor.qml src/QmlControls/ParameterEditorDialog.qml diff --git a/src/AutoPilotPlugins/Common/MotorComponent.qml b/src/AutoPilotPlugins/Common/MotorComponent.qml index 60a5304b99dcc885d0485cce126da66697350680..fd41c08a3fe7b3deaa07fe07464057f8d9ead5fc 100644 --- a/src/AutoPilotPlugins/Common/MotorComponent.qml +++ b/src/AutoPilotPlugins/Common/MotorComponent.qml @@ -106,11 +106,6 @@ SetupPage { coaxial: controller.vehicle.coaxialMotors } - MultiRotorMotorDisplayLegend { - anchors.top: parent.top - anchors.bottom: parent.bottom - width: height - } } // Row QGCLabel { diff --git a/src/QmlControls/MultiRotorMotorDisplayLegend.qml b/src/QmlControls/MultiRotorMotorDisplayLegend.qml deleted file mode 100644 index 6b11ec3b2f72829b257b95a67fdbd7b026b6e395..0000000000000000000000000000000000000000 --- a/src/QmlControls/MultiRotorMotorDisplayLegend.qml +++ /dev/null @@ -1,71 +0,0 @@ -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 diff --git a/src/QmlControls/QGroundControl.Controls.qmldir b/src/QmlControls/QGroundControl.Controls.qmldir index 6a9a1170cbdd2b320c370d2c82def990c55416dd..472abd579ab5707515adf00b8b09d7618353ad70 100644 --- a/src/QmlControls/QGroundControl.Controls.qmldir +++ b/src/QmlControls/QGroundControl.Controls.qmldir @@ -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