Merge branch 'master' into Fix-custom-paramters-view

mavlink · Dec 20, 2024 · 8857cb1 · 8857cb1
2 parents 4f6068c + 0bb79fd
commit 8857cb1
Show file tree

Hide file tree

Showing 10 changed files with 138 additions and 9 deletions.
diff --git a/custom-example/custom.qrc b/custom-example/custom.qrc
@@ -30,7 +30,9 @@
         <file alias="Custom/Widgets/qmldir">res/Custom/Widgets/qmldir</file>
     </qresource>
     <qresource prefix="/qml">
-        <file alias="QGroundControl/FlightDisplay/FlyViewCustomLayer.qml">res/CustomFlyViewOverlay.qml</file>
+        <file alias="QGroundControl/FlightDisplay/CustomGuidedActionsController.qml">src/CustomGuidedActionsController.qml</file>
+        <file alias="QGroundControl/FlightDisplay/FlyViewCustomLayer.qml">src/FlyViewCustomLayer.qml</file>
+        <file alias="QGroundControl/FlightDisplay/FlyViewToolStripActionList.qml">src/FlyViewToolStripActionList.qml</file>
     </qresource>
     <qresource prefix="/res">
         <file alias="QGCLogoFull.svg">res/QGCLogoFull.svg</file>

diff --git a/custom-example/qgroundcontrol.exclusion b/custom-example/qgroundcontrol.exclusion
@@ -1,2 +1,4 @@
+        <file alias="QGroundControl/FlightDisplay/CustomGuidedActionsController.qml">src/FlightDisplay/CustomGuidedActionsController.qml</file>
         <file alias="QGroundControl/FlightDisplay/FlyViewCustomLayer.qml">src/FlightDisplay/FlyViewCustomLayer.qml</file>
+        <file alias="QGroundControl/FlightDisplay/FlyViewToolStripActionList.qml">src/FlightDisplay/FlyViewToolStripActionList.qml</file>
 
diff --git a/custom-example/qgroundcontrol.qrc b/custom-example/qgroundcontrol.qrc
@@ -232,7 +232,6 @@
 		<file alias="QGroundControl/FlightDisplay/FlyViewToolBar.qml">../src/UI/toolbar/FlyViewToolBar.qml</file>
 		<file alias="QGroundControl/FlightDisplay/FlyViewToolBarIndicators.qml">../src/UI/toolbar/FlyViewToolBarIndicators.qml</file>
 		<file alias="QGroundControl/FlightDisplay/FlyViewToolStrip.qml">../src/FlightDisplay/FlyViewToolStrip.qml</file>
-		<file alias="QGroundControl/FlightDisplay/FlyViewToolStripActionList.qml">../src/FlightDisplay/FlyViewToolStripActionList.qml</file>
 		<file alias="QGroundControl/FlightDisplay/FlyViewTopRightColumnLayout.qml">../src/FlightDisplay/FlyViewTopRightColumnLayout.qml</file>
 		<file alias="QGroundControl/FlightDisplay/FlyViewVideo.qml">../src/FlightDisplay/FlyViewVideo.qml</file>
 		<file alias="QGroundControl/FlightDisplay/OnScreenGimbalController.qml">../src/FlightDisplay/OnScreenGimbalController.qml</file>

diff --git a/custom-example/src/CustomGuidedActionsController.qml b/custom-example/src/CustomGuidedActionsController.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+ *
+ * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+// Custom builds can override this file to add custom guided actions.
+
+import QtQml
+
+QtObject {
+    readonly property int actionCustomButton: _guidedController.customActionStart + 0
+
+    readonly property string customButtonTitle: qsTr("Custom")
+
+    readonly property string customButtonMessage: qsTr("Example of a custom action.")
+
+    function customConfirmAction(actionCode, actionData, mapIndicator, confirmDialog) {
+        switch (actionCode) {
+        case actionCustomButton:
+            confirmDialog.hideTrigger = true
+            confirmDialog.title = customButtonTitle
+            confirmDialog.message = customButtonMessage
+            break
+        default:
+            return false // false = action not handled here
+        }
+
+        return true // true = action handled here
+    }
+
+    function customExecuteAction(actionCode, actionData, sliderOutputValue, optionCheckedode) {
+        switch (actionCode) {
+        case actionCustomButton:
+            mainWindow.showMessageDialog("Custom Action", "Custom action executed.")
+            break
+        default:
+            return false // false = action not handled here
+        }
+
+        return true // true = action handled here
+    }
+}
diff --git a/custom-example/res/CustomFlyViewOverlay.qml → custom-example/src/FlyViewCustomLayer.qml b/custom-example/res/CustomFlyViewOverlay.qml → custom-example/src/FlyViewCustomLayer.qml
@@ -95,11 +95,11 @@ Item {
         id:                         compassBar
         height:                     ScreenTools.defaultFontPixelHeight * 1.5
         width:                      ScreenTools.defaultFontPixelWidth  * 50
+        anchors.bottom:             parent.bottom
+        anchors.bottomMargin:       _toolsMargin
         color:                      "#DEDEDE"
         radius:                     2
         clip:                       true
-        anchors.top:                headingIndicator.bottom
-        anchors.topMargin:          -headingIndicator.height / 2
         anchors.horizontalCenter:   parent.horizontalCenter
         Repeater {
             model: 720
@@ -137,8 +137,8 @@ Item {
         height:                     ScreenTools.defaultFontPixelHeight
         width:                      ScreenTools.defaultFontPixelWidth * 4
         color:                      qgcPal.windowShadeDark
-        anchors.top:                parent.top
-        anchors.topMargin:          _toolsMargin
+        anchors.top:                compassBar.top
+        anchors.topMargin:          -headingIndicator.height / 2
         anchors.horizontalCenter:   parent.horizontalCenter
         QGCLabel {
             text:                   _heading

diff --git a/custom-example/src/FlyViewToolStripActionList.qml b/custom-example/src/FlyViewToolStripActionList.qml
@@ -0,0 +1,43 @@
+/****************************************************************************
+ *
+ * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQml.Models
+
+import QGroundControl
+import QGroundControl.Controls
+
+ToolStripActionList {
+    id: _root
+
+    signal displayPreFlightChecklist
+
+    model: [
+        ToolStripAction {
+            text:           qsTr("Plan")
+            iconSource:     "/qmlimages/Plan.svg"
+            onTriggered:{
+                mainWindow.showPlanView()
+                viewer3DWindow.close()
+            }
+        },
+        PreFlightCheckListShowAction { onTriggered: displayPreFlightChecklist() },
+        GuidedActionTakeoff { },
+        GuidedActionLand { },
+        GuidedActionRTL { },
+        GuidedActionPause { },
+        GuidedActionActionList { },
+        GuidedToolStripAction {
+            text:       _guidedController._customController.customButtonTitle
+            iconSource: "/res/gear-white.svg"
+            visible:    true
+            enabled:    true
+            actionID:   _guidedController._customController.actionCustomButton
+}
+    ]
+}
diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
@@ -222,6 +222,7 @@
         <file alias="QGroundControl/FactControls/LabelledFactTextField.qml">src/FactSystem/FactControls/LabelledFactTextField.qml</file>
         <file alias="QGroundControl/FactControls/LabelledFactSlider.qml">src/FactSystem/FactControls/LabelledFactSlider.qml</file>
         <file alias="QGroundControl/FactControls/qmldir">src/QmlControls/QGroundControl/FactControls/qmldir</file>
+        <file alias="QGroundControl/FlightDisplay/CustomGuidedActionsController.qml">src/FlightDisplay/CustomGuidedActionsController.qml</file>
         <file alias="QGroundControl/FlightDisplay/FlightDisplayViewVideo.qml">src/FlightDisplay/FlightDisplayViewVideo.qml</file>
         <file alias="QGroundControl/FlightDisplay/FlyView.qml">src/FlightDisplay/FlyView.qml</file>
         <file alias="QGroundControl/FlightDisplay/FlyViewBottomRightRowLayout.qml">src/FlightDisplay/FlyViewBottomRightRowLayout.qml</file>

diff --git a/src/FlightDisplay/CustomGuidedActionsController.qml b/src/FlightDisplay/CustomGuidedActionsController.qml
@@ -0,0 +1,22 @@
+/****************************************************************************
+ *
+ * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+// Custom builds can override this file to add custom guided actions.
+
+import QtQml
+
+QtObject {
+    function customConfirmAction(actionCode, actionData, mapIndicator, confirmDialog) {
+        return false // false = action not handled here
+    }
+
+    function customExecuteAction(actionCode, actionData, sliderOutputValue, optionCheckedode) {
+        return false // false = action not handled here
+    }
+}
diff --git a/src/FlightDisplay/GuidedActionsController.qml b/src/FlightDisplay/GuidedActionsController.qml
@@ -120,6 +120,8 @@ Item {
     readonly property int actionSetFlightMode:              29
     readonly property int actionChangeHeading:              30
 
+    readonly property int customActionStart:                10000 // Custom actions ids should start here so that they don't collide with the built in actions
+
     property var    _activeVehicle:             QGroundControl.multiVehicleManager.activeVehicle
     property var    _flyViewSettings:           QGroundControl.settingsManager.flyViewSettings
     property var    _unitsConversion:           QGroundControl.unitsConversion
@@ -194,6 +196,12 @@ Item {
     property bool __orbitSupported:         _activeVehicle ? !_hideOrbit && _activeVehicle.orbitModeSupported : false
     property bool __flightMode:             _flightMode
 
+    // Allow custom builds to add custom actions by overriding CustomGuidedActionsController.qml
+    CustomGuidedActionsController {
+        id: customController
+    }
+    property var _customController: customController
+
     function _isGuidedActionsControllerLogEnabled() {
         return QGroundControl.categoryLoggingOn("GuidedActionsControllerLog")
     }
@@ -557,8 +565,10 @@ Item {
             confirmDialog.message = changeHeadingMessage
             break
         default:
-            console.warn("Unknown actionCode", actionCode)
-            return
+            if (!customController.customConfirmAction(actionCode, actionData, mapIndicator, confirmDialog)) {
+                console.warn("Unknown actionCode", actionCode)
+                return
+            }
         }
         confirmDialog.show(showImmediate)
     }
@@ -669,7 +679,10 @@ Item {
             _activeVehicle.guidedModeChangeHeading(actionData)
             break
         default:
-            console.warn(qsTr("Internal error: unknown actionCode"), actionCode)
+            if (!customController.customExecuteAction(actionCode, actionData, sliderOutputValue, optionChecked)) {
+                console.warn(qsTr("Internal error: unknown actionCode"), actionCode)
+                return
+            }
             break
         }
     }

diff --git a/src/QmlControls/QGroundControl/FlightDisplay/qmldir b/src/QmlControls/QGroundControl/FlightDisplay/qmldir
@@ -1,5 +1,6 @@
 Module QGroundControl.FlightDisplay
 
+CustomGuidedActionsController   1.0 CustomGuidedActionsController.qml
 FlyView                         1.0 FlyView.qml
 FlyViewBottomRightRowLayout     1.0 FlyViewBottomRightRowLayout.qml
 FlyViewCustomLayer              1.0 FlyViewCustomLayer.qml