Merge pull request #1716 from DonLakeFlyer/FlightModeConfig

Flight Mode config redesign

qgroundcontrol.qrc

@@ -93,6 +93,7 @@
         <file alias="QGroundControl/Controls/QGCViewMessage.qml">src/QmlControls/QGCViewMessage.qml</file>
         <file alias="QGroundControl/Controls/ParameterEditor.qml">src/QmlControls/ParameterEditor.qml</file>
         <file alias="QGroundControl/Controls/ParameterEditorDialog.qml">src/QmlControls/ParameterEditorDialog.qml</file>
+        <file alias="QGroundControl/Controls/ModeSwitchDisplay.qml">src/QmlControls/ModeSwitchDisplay.qml</file>
         <file alias="ParameterEditorWidget.qml">src/ViewWidgets/ParameterEditorWidget.qml</file>
         <file alias="CustomCommandWidget.qml">src/ViewWidgets/CustomCommandWidget.qml</file>
         <file alias="SetupView.qml">src/VehicleSetup/SetupView.qml</file>

src/QmlControls/ModeSwitchDisplay.qml

+/*=====================================================================
+
+ QGroundControl Open Source Ground Control Station
+
+ (c) 2009 - 2015 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+ This file is part of the QGROUNDCONTROL project
+
+ QGROUNDCONTROL is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ QGROUNDCONTROL is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+ ======================================================================*/
+
+import QtQuick 2.2
+import QtQuick.Controls 1.2
+import QtQuick.Controls.Styles 1.2
+
+import QGroundControl.Palette 1.0
+import QGroundControl.ScreenTools 1.0
+
+Rectangle {
+    property string flightModeName          ///< User visible name for this  flight mode
+    property string flightModeDescription
+    property real   rcValue                 ///< Current rcValue to show in Monitor display, range: 0.0 - 1.0
+    property int    modeChannelIndex        ///< Index into channel list for this mode
+    property bool   modeChannelEnabled      ///< true: Channel combo box is enabled
+    property bool   modeSelected            ///< true: This mode is currently selected
+    property real   thresholdValue          ///< Treshold setting for this mode, show in Threshold display, range 0.0 - 1.0
+    property bool   thresholdDragEnabled    ///< true: Threshold value indicator can be dragged to modify value
+
+    anchors.leftMargin:     ScreenTools.defaultFontPixelWidth
+    anchors.rightMargin:    ScreenTools.defaultFontPixelWidth
+    anchors.left:           parent.left
+    anchors.right:          parent.right
+    height:                 column.height + (ScreenTools.defaultFontPixelWidth * 2)
+    color:                  _qgcPal.windowShade
+
+    QGCPalette { id: _qgcPal; colorGroupEnabled: enabled }
+
+    Item {
+        anchors.margins:    ScreenTools.defaultFontPixelWidth
+        anchors.fill:       parent
+
+        Column {
+            id:         column
+            width:      parent.width
+            spacing:    ScreenTools.defaultFontPixelHeight / 4
+
+            Row {
+                width:      parent.width
+                spacing:    ScreenTools.defaultFontPixelWidth
+
+                Rectangle {
+                    width:  modeLabel.width
+                    height: modeLabel.contentHeight
+                    color:  modeSelected ? _qgcPal.buttonHighlight : _qgcPal.windowShade
+
+                    QGCLabel {
+                        id:                     modeLabel
+                        width:                  ScreenTools.defaultFontPixelWidth * 18
+                        color:                  modeSelected ? _qgcPal.buttonHighlightText : _qgcPal.text
+                        horizontalAlignment:    Text.AlignHCenter
+                        font.pixelSize:         ScreenTools.mediumFontPixelSize
+                        text:                   flightModeName
+                    }
+                }
+
+                QGCComboBox {
+                    id:             channelCombo
+                    width:          ScreenTools.defaultFontPixelWidth * 15
+                    model:          controller.channelListModel
+                    currentIndex:   modeChannelIndex
+                    enabled:        modeChannelEnabled
+
+                    onActivated: modeChannelIndex = index
+                }
+
+                QGCLabel {
+                    width:      parent.width - x
+                    wrapMode:   Text.WordWrap
+                    text:       flightModeDescription
+                }
+            }
+
+            Row {
+                width:      parent.width
+                spacing:    ScreenTools.defaultFontPixelWidth * 2
+
+                QGCLabel {
+                    width:              ScreenTools.defaultFontPixelWidth * monitorThresholdCharWidth
+                    height:             ScreenTools.defaultFontPixelHeight
+                    verticalAlignment:  Text.AlignVCenter
+                    text:               "Monitor:"
+                }
+
+                Item {
+                    height: ScreenTools.defaultFontPixelHeight
+                    width:  parent.width - x
+
+                    // Won't be able to pull these properties, need to reference parent.
+                    property int            __lastRcValue:      1500
+                    readonly property int   __rcValueMaxJitter: 2
+
+                    // Bar
+                    Rectangle {
+                        id:                     bar
+                        anchors.verticalCenter: parent.verticalCenter
+                        width:                  parent.width
+                        height:                 parent.height / 2
+                        color:                  _qgcPal.windowShadeDark
+                    }
+
+                    // RC Indicator
+                    Rectangle {
+                        anchors.verticalCenter: parent.verticalCenter
+                        width:                  parent.height * 0.75
+                        height:                 width
+                        x:                      (parent.width * rcValue) - (width / 2)
+                        radius:                 width / 2
+                        color:                  _qgcPal.text
+                    }
+                } // Item
+            }
+
+            Row {
+                width:      parent.width
+                spacing:    ScreenTools.defaultFontPixelWidth * 2
+
+                QGCLabel {
+                    width:              ScreenTools.defaultFontPixelWidth * monitorThresholdCharWidth
+                    height:             ScreenTools.defaultFontPixelHeight
+                    verticalAlignment:  Text.AlignVCenter
+                    text:               "Threshold:"
+                }
+
+
+                Item {
+                    id:     thresholdContainer
+                    height: ScreenTools.defaultFontPixelHeight
+                    width:  parent.width - x
+
+                    // Bar
+                    Rectangle {
+                        anchors.verticalCenter: parent.verticalCenter
+                        width:                  parent.width
+                        height:                 parent.height / 2
+                        color:                  _qgcPal.windowShadeDark
+                    }
+
+                    // Threshold Indicator
+                    Rectangle {
+                        id:                     thresholdIndicator
+                        anchors.verticalCenter: parent.verticalCenter
+                        width:                  parent.height * 0.75
+                        height:                 width
+                        x:                      (parent.width * thresholdValue) - (width / 2)
+                        radius:                 width / 2
+                        color:                  thresholdDragEnabled ? _qgcPal.buttonHighlight : _qgcPal.text
+
+                        Drag.active:    thresholdDrag.drag.active
+                        Drag.hotSpot.x: width / 2
+                        Drag.hotSpot.y: height / 2
+
+                        MouseArea {
+                            id:             thresholdDrag
+                            anchors.fill:   parent
+                            cursorShape:    Qt.SizeHorCursor
+                            drag.target:    thresholdDragEnabled ? parent : null
+                            drag.minimumX:  - (width / 2)
+                            drag.maximumX:  thresholdContainer.width - (width / 2)
+                            drag.axis:      Drag.XAxis
+
+                            property bool dragActive: drag.active
+
+                            onDragActiveChanged: {
+                                if (!drag.active) {
+                                    thresholdValue = (thresholdIndicator.x + (thresholdIndicator.width / 2)) / thresholdContainer.width
+                                }
+                            }
+                        }
+                    }
+                } // Item
+            } // Row
+        } // Column
+    } // Item
+} // Rectangle

src/QmlControls/QGroundControl.Controls.qmldir

@@ -19,6 +19,8 @@ ViewWidget 1.0 ViewWidget.qml
 ParameterEditor 1.0 ParameterEditor.qml
 ParameterEditorDialog 1.0 ParameterEditorDialog.qml
 
+ModeSwitchDisplay 1.0 ModeSwitchDisplay.qml
+
 QGCView 1.0 QGCView.qml
 QGCViewPanel 1.0 QGCViewPanel.qml
 QGCViewDialog 1.0 QGCViewDialog.qml