From 86426f234105dccdcf2fb2596a08c68eb1aa5a9f Mon Sep 17 00:00:00 2001 From: Valentin Platzgummer Date: Sun, 13 Oct 2019 17:56:32 +0200 Subject: [PATCH] editing FlightDisplayWimaMenu.qml --- WimaDok/main.tex | 2 ++ qgroundcontrol.qrc | 1 + src/FlightDisplay/FlightDisplayView.qml | 22 +++++++++----- src/FlightDisplay/FlightDisplayWimaMenu.qml | 32 +++++++++++++++++++++ src/FlightDisplay/qmldir | 1 + src/FlightMap/Images/.directory | 4 +++ src/Wima/WimaController.cc | 5 ---- 7 files changed, 55 insertions(+), 12 deletions(-) create mode 100644 src/FlightDisplay/FlightDisplayWimaMenu.qml create mode 100644 src/FlightMap/Images/.directory diff --git a/WimaDok/main.tex b/WimaDok/main.tex index 15efb68025..b569afe1d0 100644 --- a/WimaDok/main.tex +++ b/WimaDok/main.tex @@ -26,6 +26,8 @@ WiMA is a abbreviation for \textbf{Wi}reless \textbf{M}easurement \textbf{A}ppli This document was created to explain the functionality of the WiMA-Extension at one hand, and to encourage the reader to find bugs inside the program. As the extension is still being developed the contents demonstrated inside this document may differ from those ones in the program. 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} diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index cc07dd4073..c5cdea2278 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -229,6 +229,7 @@ src/WimaView/WimaCorridorEditor.qml src/FlightMap/MapItems/WimaPlanMapItems.qml src/PlanView/WimaMissionItemMapVisual.qml + src/FlightDisplay/FlightDisplayWimaMenu.qml src/Settings/APMMavlinkStreamRate.SettingsGroup.json diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 673974b021..6a4e25cebe 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/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 } //------------------------------------------------------------------------- diff --git a/src/FlightDisplay/FlightDisplayWimaMenu.qml b/src/FlightDisplay/FlightDisplayWimaMenu.qml new file mode 100644 index 0000000000..1d90c0f09f --- /dev/null +++ b/src/FlightDisplay/FlightDisplayWimaMenu.qml @@ -0,0 +1,32 @@ +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") + } + } +} diff --git a/src/FlightDisplay/qmldir b/src/FlightDisplay/qmldir index f37894a8b7..7eb144dc6d 100644 --- a/src/FlightDisplay/qmldir +++ b/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 diff --git a/src/FlightMap/Images/.directory b/src/FlightMap/Images/.directory new file mode 100644 index 0000000000..7f2a552800 --- /dev/null +++ b/src/FlightMap/Images/.directory @@ -0,0 +1,4 @@ +[Dolphin] +PreviewsShown=true +Timestamp=2019,10,13,16,25,8 +Version=4 diff --git a/src/Wima/WimaController.cc b/src/Wima/WimaController.cc index fa3705bb1a..435f93909d 100644 --- a/src/Wima/WimaController.cc +++ b/src/Wima/WimaController.cc @@ -123,11 +123,6 @@ void WimaController::resumeMission() } -bool WimaController::updateMission() -{ - return true; -} - void WimaController::saveToCurrent() { } -- GitLab