Skip to content

Q
qgroundcontrol
Commit c61648b3 authored by Valentin Platzgummer's avatar Valentin Platzgummer
Browse files
Options

code edited

parent d7e3f781
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 4 deletions
qgroundcontrol.qrc
View file @ c61648b3
......@@ -208,9 +208,11 @@
<file alias="VibrationPageWidget.qml">src/FlightMap/Widgets/VibrationPageWidget.qml</file>
<file alias="VideoPageWidget.qml">src/FlightMap/Widgets/VideoPageWidget.qml</file>
<file alias="VirtualJoystick.qml">src/FlightDisplay/VirtualJoystick.qml</file>
<file alias="QGroundControl/Controls/QuadToolBar.qml">src/QuadView/QuadToolBar.qml</file>
<file alias="QuadView.qml">src/QuadView/QuadView.qml</file>
</qresource>
<qresource prefix="/json">
<file alias="APMMavlinkStreamRate.SettingsGroup.json">src/Settings/APMMavlinkStreamRate.SettingsGroup.json</file>
<file alias="APMMavlinkStreamRate.SettingsGroup.json">src/Settings/APMMavlinkStreamRate.SettingsGroup.json</file>
<file alias="CameraCalc.FactMetaData.json">src/MissionManager/CameraCalc.FactMetaData.json</file>
<file alias="CameraSpec.FactMetaData.json">src/MissionManager/CameraSpec.FactMetaData.json</file>
<file alias="CorridorScan.SettingsGroup.json">src/MissionManager/CorridorScan.SettingsGroup.json</file>
......@@ -225,7 +227,7 @@
<file alias="FlightMap.SettingsGroup.json">src/Settings/FlightMap.SettingsGroup.json</file>
<file alias="FWLandingPattern.FactMetaData.json">src/MissionManager/FWLandingPattern.FactMetaData.json</file>
<file alias="FlyView.SettingsGroup.json">src/Settings/FlyView.SettingsGroup.json</file>
<file alias="PlanView.SettingsGroup.json">src/Settings/PlanView.SettingsGroup.json</file>
<file alias="PlanView.SettingsGroup.json">src/Settings/PlanView.SettingsGroup.json</file>
<file alias="MavCmdInfoCommon.json">src/MissionManager/MavCmdInfoCommon.json</file>
<file alias="MavCmdInfoFixedWing.json">src/MissionManager/MavCmdInfoFixedWing.json</file>
<file alias="MavCmdInfoMultiRotor.json">src/MissionManager/MavCmdInfoMultiRotor.json</file>
......
src/QmlControls/QGroundControl.Controls.qmldir
View file @ c61648b3
......@@ -65,6 +65,7 @@ QGCViewDialog 1.0 QGCViewDialog.qml
QGCViewDialogContainer 1.0 QGCViewDialogContainer.qml
QGCViewMessage 1.0 QGCViewMessage.qml
QGCViewPanel 1.0 QGCViewPanel.qml
QuadToolBar 1.0 QuadToolBar.qml
RallyPointEditorHeader 1.0 RallyPointEditorHeader.qml
RallyPointItemEditor 1.0 RallyPointItemEditor.qml
RallyPointMapVisuals 1.0 RallyPointMapVisuals.qml
......
src/ui/MainWindowInner.qml
View file @ c61648b3
......@@ -33,11 +33,12 @@ Item {
property var activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property string formatedMessage: activeVehicle ? activeVehicle.formatedMessage : ""
property var _viewList: [ settingsViewLoader, setupViewLoader, flightView, planViewLoader, analyzeViewLoader ]
property var _viewList: [ settingsViewLoader, setupViewLoader, planViewLoader, quadViewLoader, flightView, analyzeViewLoader ]
readonly property string _settingsViewSource: "AppSettings.qml"
readonly property string _setupViewSource: "SetupView.qml"
readonly property string _planViewSource: "PlanView.qml"
readonly property string _quadViewSource: "QuadView.qml"
readonly property string _analyzeViewSource: "AnalyzeView.qml"
onHeightChanged: {
......@@ -109,6 +110,21 @@ Item {
planToolBar.visible = true
}
function showQuadView() {
mainWindow.enableToolbar()
rootLoader.sourceComponent = null
if(currentPopUp) {
currentPopUp.close()
}
if (quadViewLoader.source != _quadViewSource) {
quadViewLoader.source = _quadViewSource
}
ScreenTools.availableHeight = parent.height - toolBar.height
hideAllViews()
quadViewLoader.visible = true
quadToolBar.visible = true
}
function showFlyView() {
mainWindow.enableToolbar()
rootLoader.sourceComponent = null
......@@ -163,6 +179,16 @@ Item {
onYes: activeConnectionsCloseDialog.check()
// here what to do?
function check() {
if (planViewLoader.item && planViewLoader.item.dirty) {
unsavedMissionCloseDialog.open()
......@@ -283,7 +309,7 @@ Item {
onShowSetupView: mainWindow.showSetupView()
onShowFlyView: mainWindow.showFlyView()
onShowPlanView: mainWindow.showPlanView()
onShowQuadView: mainWindow.showQuadView()
onShowAnalyzeView: mainWindow.showAnalyzeView()
onArmVehicle: flightView.guidedController.confirmAction(flightView.guidedController.actionArm)
onDisarmVehicle: {
......@@ -318,6 +344,20 @@ Item {
}
}
QuadToolBar {
id: quadToolBar
height: ScreenTools.toolbarHeight
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
z: toolBar.z + 1
onShowFlyView: {
quadToolBar.visible = false
mainWindow.showFlyView()
}
}
Loader {
id: settingsViewLoader
anchors.left: parent.left
......@@ -353,6 +393,14 @@ Item {
property var toolbar: planToolBar
}
Loader {
id: quadViewLoader
anchors.fill: parent
visible: false
property var toolbar: quadToolBar
}
FlightDisplayView {
id: flightView
anchors.fill: parent
......
src/ui/toolbar/MainToolBar.qml
View file @ c61648b3
......@@ -30,6 +30,7 @@ Rectangle {
signal showSettingsView
signal showSetupView
signal showPlanView
signal showQuadView
signal showFlyView
signal showAnalyzeView
signal armVehicle
......@@ -49,6 +50,10 @@ Rectangle {
planButton.checked = true
}
function checkQuadButton() {
quadButton.checked = true
}
function checkFlyButton() {
flyButton.checked = true
}
......@@ -121,6 +126,15 @@ Rectangle {
onClicked: toolBar.showPlanView()
}
QGCToolBarButton {
id: quadButton
anchors.top: parent.top
anchors.bottom: parent.bottom
exclusiveGroup: mainActionGroup
source: "/res/waves.svg"
onClicked: toolBar.showQuadView()
}
QGCToolBarButton {
id: flyButton
anchors.top: parent.top
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment