editing FlightDisplayWimaMenu.qml

WimaDok/main.tex

@@ -27,6 +27,8 @@ This document was created to explain the functionality of the WiMA-Extension at
 
 The folder "deploy" in the QGroundControl root directory (can be cloned from Gitlab) contains a AppImage of the program. QGroundControl can be launched by double-clicking the AppImage. Currently only a Linux version is available.
 
+A Documentation of the QGroundControl program can be found under \url{https://docs.qgroundcontrol.com/en/}.
+ 
 
 \section{Documentation}
 \subsection{Structure of QGroundControl with WiMA-Extension}

qgroundcontrol.qrc

@@ -229,6 +229,7 @@
         <file alias="QGroundControl/Controls/WimaCorridorEditor.qml">src/WimaView/WimaCorridorEditor.qml</file>
         <file alias="QGroundControl/FlightMap/WimaPlanMapItems.qml">src/FlightMap/MapItems/WimaPlanMapItems.qml</file>
         <file alias="QGroundControl/FlightMap/WimaMissionItemMapVisual.qml">src/PlanView/WimaMissionItemMapVisual.qml</file>
+        <file alias="QGroundControl/FlightDisplay/FlightDisplayWimaMenu.qml">src/FlightDisplay/FlightDisplayWimaMenu.qml</file>
     </qresource>
     <qresource prefix="/json">
         <file alias="APMMavlinkStreamRate.SettingsGroup.json">src/Settings/APMMavlinkStreamRate.SettingsGroup.json</file>

src/FlightDisplay/FlightDisplayView.qml

@@ -510,17 +510,25 @@ QGCView {
             }
         }
 
-        FlightDisplayViewWidgets {
-            id:                 flightDisplayViewWidgets
+//        FlightDisplayViewWidgets {
+//            id:                 flightDisplayViewWidgets
+//            z:                  _panel.z + 4
+//            height:             ScreenTools.availableHeight - (singleMultiSelector.visible ? singleMultiSelector.height + _margins : 0)
+//            anchors.left:       parent.left
+//            anchors.right:      altitudeSlider.visible ? altitudeSlider.left : parent.right
+//            anchors.bottom:     parent.bottom
+//            qgcView:            root
+//            useLightColors:     isBackgroundDark
+//            missionController:  _missionController
+//            visible:            singleVehicleView.checked && !QGroundControl.videoManager.fullScreen
+//        }
+
+        FlightDisplayWimaMenu {
+            id: wimaMenu
             z:                  _panel.z + 4
-            height:             ScreenTools.availableHeight - (singleMultiSelector.visible ? singleMultiSelector.height + _margins : 0)
             anchors.left:       parent.left
             anchors.right:      altitudeSlider.visible ? altitudeSlider.left : parent.right
             anchors.bottom:     parent.bottom
-            qgcView:            root
-            useLightColors:     isBackgroundDark
-            missionController:  _missionController
-            visible:            singleVehicleView.checked && !QGroundControl.videoManager.fullScreen
         }
 
         //-------------------------------------------------------------------------

src/FlightDisplay/FlightDisplayWimaMenu.qml

+import QtQuick                  2.3
+import QtQuick.Controls         1.2
+import QtQuick.Controls.Styles  1.4
+import QtQuick.Dialogs          1.2
+import QtLocation               5.3
+import QtPositioning            5.3
+import QtQuick.Layouts          1.2
+
+import QGroundControl               1.0
+import QGroundControl.ScreenTools   1.0
+import QGroundControl.Controls      1.0
+import QGroundControl.Palette       1.0
+import QGroundControl.Vehicle       1.0
+import QGroundControl.FlightMap     1.0
+import QGroundControl.Airspace      1.0
+import QGroundControl.Airmap        1.0
+
+Item {
+    id: _root
+
+    Rectangle {
+        anchors.top:        parent.top
+        color:              "white"
+        height: 100
+        width: 200
+
+        QGCCheckBox {
+            id: enableWima
+            text: qsTr("WiMA")
+        }
+    }
+}

src/FlightDisplay/qmldir

@@ -15,4 +15,5 @@ PreFlightGPSCheck           1.0 PreFlightGPSCheck.qml
 PreFlightRCCheck            1.0 PreFlightRCCheck.qml
 PreFlightSensorsHealthCheck 1.0 PreFlightSensorsHealthCheck.qml
 PreFlightSoundCheck         1.0 PreFlightSoundCheck.qml
+FlightDisplayWimaMenu       1.0 FlightDisplayWimaMenu.qml
 

src/FlightMap/Images/.directory

+[Dolphin]
+PreviewsShown=true
+Timestamp=2019,10,13,16,25,8
+Version=4

src/Wima/WimaController.cc

@@ -123,11 +123,6 @@ void WimaController::resumeMission()
 
 }
 
-bool WimaController::updateMission()
-{
-    return true;
-}
-
 void WimaController::saveToCurrent()
 {
 }