Skip to content

Q
qgroundcontrol
Commit a4c19e72 authored by dogmaphobic's avatar dogmaphobic
Browse files
Options

Making Map and Video persistent.

parent 570db278
Hide whitespace changes
Inline Side-by-side
Showing with 193 additions and 101 deletions
qgroundcontrol.qrc
View file @ a4c19e72
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
<file alias="QGroundControl/Controls/QGCCheckBox.qml">src/QmlControls/QGCCheckBox.qml</file> <file alias="QGroundControl/Controls/QGCCheckBox.qml">src/QmlControls/QGCCheckBox.qml</file>
<file alias="QGroundControl/Controls/QGCColoredImage.qml">src/QmlControls/QGCColoredImage.qml</file> <file alias="QGroundControl/Controls/QGCColoredImage.qml">src/QmlControls/QGCColoredImage.qml</file>
<file alias="QGroundControl/Controls/QGCFlickable.qml">src/QmlControls/QGCFlickable.qml</file> <file alias="QGroundControl/Controls/QGCFlickable.qml">src/QmlControls/QGCFlickable.qml</file>
<file alias="QGroundControl/Controls/QGCPipable.qml">src/QmlControls/QGCPipable.qml</file>
<file alias="QGroundControl/Controls/QGCFlickableVerticalIndicator.qml">src/QmlControls/QGCFlickableVerticalIndicator.qml</file> <file alias="QGroundControl/Controls/QGCFlickableVerticalIndicator.qml">src/QmlControls/QGCFlickableVerticalIndicator.qml</file>
<file alias="QGroundControl/Controls/QGCFlickableHorizontalIndicator.qml">src/QmlControls/QGCFlickableHorizontalIndicator.qml</file> <file alias="QGroundControl/Controls/QGCFlickableHorizontalIndicator.qml">src/QmlControls/QGCFlickableHorizontalIndicator.qml</file>
<file alias="QGroundControl/Controls/QGCComboBox.qml">src/QmlControls/QGCComboBox.qml</file> <file alias="QGroundControl/Controls/QGCComboBox.qml">src/QmlControls/QGCComboBox.qml</file>
......
src/FlightDisplay/FlightDisplayView.qml
View file @ a4c19e72
...@@ -47,7 +47,7 @@ Item { ...@@ -47,7 +47,7 @@ Item {
readonly property bool isBackgroundDark: _mainIsMap ? (_flightMap ? _flightMap.isSatelliteMap : true) : true readonly property bool isBackgroundDark: _mainIsMap ? (_flightMap ? _flightMap.isSatelliteMap : true) : true
property var _activeVehicle: multiVehicleManager.activeVehicle property var _activeVehicle: multiVehicleManager.activeVehicle
readonly property real _defaultRoll: 0 readonly property real _defaultRoll: 0
readonly property real _defaultPitch: 0 readonly property real _defaultPitch: 0
...@@ -74,145 +74,140 @@ Item { ...@@ -74,145 +74,140 @@ Item {
property real _airSpeed: _activeVehicle ? _activeVehicle.airSpeed : _defaultAirSpeed property real _airSpeed: _activeVehicle ? _activeVehicle.airSpeed : _defaultAirSpeed
property real _climbRate: _activeVehicle ? _activeVehicle.climbRate : _defaultClimbRate property real _climbRate: _activeVehicle ? _activeVehicle.climbRate : _defaultClimbRate
property var _flightMap: null
property var _flightVideo: null
property var _savedZoomLevel: 0 property var _savedZoomLevel: 0
property real _pipSize: mainWindow.width * 0.2 property real pipSize: mainWindow.width * 0.2
FlightDisplayViewController { id: _controller } FlightDisplayViewController { id: _controller }
function reloadContents() { function setStates() {
if(_flightVideo) {
_flightVideo.visible = false
}
if(_mainIsMap) { if(_mainIsMap) {
mainLoader.source = "FlightDisplayViewMap.qml" //-- Adjust Margins
pipLoader.source = "FlightDisplayViewVideo.qml" _flightMapContainer.state = "fullMode"
_flightVideo.state = "pipMode"
//-- Save/Restore Map Zoom Level
if(_savedZoomLevel != 0)
_flightMap.zoomLevel = _savedZoomLevel
else
_savedZoomLevel = _flightMap.zoomLevel
} else { } else {
mainLoader.source = "FlightDisplayViewVideo.qml" //-- Adjust Margins
pipLoader.source = "FlightDisplayViewMap.qml" _flightMapContainer.state = "pipMode"
_flightVideo.state = "fullMode"
//-- Set Map Zoom Level
_savedZoomLevel = _flightMap.zoomLevel
_flightMap.zoomLevel = _savedZoomLevel - 3
} }
} }
Component.onCompleted: { function setPipVisibility(state) {
reloadContents(); _isPipVisible = state;
widgetsLoader.source = "FlightDisplayViewWidgets.qml" QGroundControl.saveBoolGlobalSetting(_PIPVisibleKey, state)
} }
//-- Main Window Component.onCompleted: {
Loader { widgetsLoader.source = "FlightDisplayViewWidgets.qml"
id: mainLoader setStates()
anchors.fill: parent
onLoaded: {
if(_mainIsMap) {
_flightMap = item
if(_savedZoomLevel != 0)
_flightMap.zoomLevel = _savedZoomLevel
else
_savedZoomLevel = _flightMap.zoomLevel
} else {
_flightVideo = item
}
}
} }
//-- PIP Window //-- Map View
// For whatever reason, if FlightDisplayViewMap is the root item, changing
// width/height has no effect.
Item { Item {
id: pip id: _flightMapContainer
visible: _controller.hasVideo && _isPipVisible z: _mainIsMap ? root.z + 1 : root.z + 2
anchors.margins: ScreenTools.defaultFontPixelHeight anchors.left: root.left
anchors.left: parent.left anchors.bottom: root.bottom
anchors.bottom: parent.bottom visible: _mainIsMap || _isPipVisible
width: _pipSize width: _mainIsMap ? root.width : pipSize
height: _pipSize * (9/16) height: _mainIsMap ? root.height : pipSize * (9/16)
Loader { states: [
id: pipLoader State {
anchors.fill: parent name: "pipMode"
onLoaded: { PropertyChanges {
if(_mainIsMap) { target: _flightMapContainer
_flightVideo = item anchors.margins: ScreenTools.defaultFontPixelHeight
} else { }
_flightMap = item },
_savedZoomLevel = _flightMap.zoomLevel State {
_flightMap.zoomLevel = _savedZoomLevel - 3 name: "fullMode"
PropertyChanges {
target: _flightMapContainer
anchors.margins: 0
} }
} }
]
FlightDisplayViewMap {
id: _flightMap
anchors.fill: parent
} }
MouseArea { }
anchors.fill: parent
onClicked: { //-- Video View
_mainIsMap = !_mainIsMap FlightDisplayViewVideo {
reloadContents(); id: _flightVideo
QGroundControl.saveBoolGlobalSetting(_mainIsMapKey, _mainIsMap) z: _mainIsMap ? root.z + 2 : root.z + 1
} width: !_mainIsMap ? root.width : pipSize
} height: !_mainIsMap ? root.height : pipSize * (9/16)
Image { anchors.left: root.left
id: closePIP anchors.bottom: root.bottom
source: "/qmlimages/PiP.svg" visible: _controller.hasVideo && (!_mainIsMap || _isPipVisible)
mipmap: true states: [
fillMode: Image.PreserveAspectFit State {
anchors.left: parent.left name: "pipMode"
anchors.bottom: parent.bottom PropertyChanges {
height: ScreenTools.defaultFontPixelSize * 2.5 target: _flightVideo
width: ScreenTools.defaultFontPixelSize * 2.5 anchors.margins: ScreenTools.defaultFontPixelHeight
MouseArea { }
anchors.fill: parent },
onClicked: { State {
_isPipVisible = false name: "fullMode"
QGroundControl.saveBoolGlobalSetting(_PIPVisibleKey, false) PropertyChanges {
target: _flightVideo
anchors.margins: 0
} }
} }
} ]
} }
//-- Show PIP QGCPipable {
Rectangle { id: _flightVideoPipControl
id: openPIP z: _flightVideo.z + 3
anchors.left : parent.left width: pipSize
anchors.bottom: parent.bottom height: pipSize * (9/16)
anchors.margins: ScreenTools.defaultFontPixelHeight anchors.left: root.left
height: ScreenTools.defaultFontPixelSize * 2 anchors.bottom: root.bottom
width: ScreenTools.defaultFontPixelSize * 2 anchors.margins: ScreenTools.defaultFontPixelHeight
radius: ScreenTools.defaultFontPixelSize / 3 isHidden: !_isPipVisible
visible: _controller.hasVideo && !_isPipVisible isDark: isBackgroundDark
color: isBackgroundDark ? Qt.rgba(0,0,0,0.75) : Qt.rgba(0,0,0,0.5) onActivated: {
Image { _mainIsMap = !_mainIsMap
width: parent.width * 0.75 setStates()
height: parent.height * 0.75
source: "/res/buttonRight.svg"
mipmap: true
fillMode: Image.PreserveAspectFit
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
} }
MouseArea { onHideIt: {
anchors.fill: parent setPipVisibility(!state)
onClicked: {
_isPipVisible = true
QGroundControl.saveBoolGlobalSetting(_PIPVisibleKey, true)
}
} }
} }
//-- Widgets //-- Widgets
Loader { Loader {
id: widgetsLoader id: widgetsLoader
z: root.z + 4
anchors.right: parent.right anchors.right: parent.right
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
height: availableHeight height: availableHeight
property bool isBackgroundDark: root.isBackgroundDark property bool isBackgroundDark: root.isBackgroundDark
} }
//-- Virtual Joystick //-- Virtual Joystick
Item { Item {
id: multiTouchItem id: multiTouchItem
width: parent.width - (pip.width / 2) z: root.z + 5
width: parent.width - (_flightVideoPipControl.width / 2)
height: thumbAreaHeight height: thumbAreaHeight
visible: QGroundControl.virtualTabletJoystick visible: QGroundControl.virtualTabletJoystick
anchors.bottom: pip.top anchors.bottom: _flightVideoPipControl.top
anchors.bottomMargin: ScreenTools.defaultFontPixelHeight * 2 anchors.bottomMargin: ScreenTools.defaultFontPixelHeight * 2
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
......
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @ a4c19e72
...@@ -118,8 +118,8 @@ Item { ...@@ -118,8 +118,8 @@ Item {
anchors.margins: ScreenTools.defaultFontPixelHeight anchors.margins: ScreenTools.defaultFontPixelHeight
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
width: _pipSize width: pipSize
height: _pipSize * (9/16) height: pipSize * (9/16)
color: Qt.rgba(0,0,0,0.75) color: Qt.rgba(0,0,0,0.75)
Column { Column {
id: instruments id: instruments
......
src/FlightDisplay/qmldir
View file @ a4c19e72
Module QGroundControl.FlightDisplay Module QGroundControl.FlightDisplay
FlightDisplayView 1.0 FlightDisplayView.qml FlightDisplayView 1.0 FlightDisplayView.qml
FlightDisplayViewMap 1.0 FlightDisplayViewMap.qml
src/QmlControls/QGCPipable.qml 0 → 100644
View file @ a4c19e72
/*=====================================================================
QGroundControl Open Source Ground Control Station
(c) 2009, 2016 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.5
import QtQuick.Controls 1.3
import QGroundControl 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
Item {
id: pip
property bool isHidden: false
property bool isDark: false
signal activated()
signal hideIt(bool state)
MouseArea {
anchors.fill: parent
enabled: !isHidden
onClicked: {
pip.activated()
}
}
//-- PIP Corner Indicator
Image {
id: closePIP
source: "/qmlimages/PiP.svg"
mipmap: true
fillMode: Image.PreserveAspectFit
anchors.left: parent.left
anchors.bottom: parent.bottom
visible: !isHidden
height: ScreenTools.defaultFontPixelSize * 2.5
width: ScreenTools.defaultFontPixelSize * 2.5
MouseArea {
anchors.fill: parent
onClicked: {
pip.hideIt(true)
}
}
}
//-- Show PIP
Rectangle {
id: openPIP
anchors.left : parent.left
anchors.bottom: parent.bottom
height: ScreenTools.defaultFontPixelSize * 2
width: ScreenTools.defaultFontPixelSize * 2
radius: ScreenTools.defaultFontPixelSize / 3
visible: isHidden
color: isDark ? Qt.rgba(0,0,0,0.75) : Qt.rgba(0,0,0,0.5)
Image {
width: parent.width * 0.75
height: parent.height * 0.75
source: "/res/buttonRight.svg"
mipmap: true
fillMode: Image.PreserveAspectFit
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
MouseArea {
anchors.fill: parent
onClicked: {
pip.hideIt(false)
}
}
}
}
src/QmlControls/QGroundControl.Controls.qmldir
View file @ a4c19e72
...@@ -21,6 +21,7 @@ QGCComboBox 1.0 QGCComboBox.qml ...@@ -21,6 +21,7 @@ QGCComboBox 1.0 QGCComboBox.qml
QGCFlickable 1.0 QGCFlickable.qml QGCFlickable 1.0 QGCFlickable.qml
QGCLabel 1.0 QGCLabel.qml QGCLabel 1.0 QGCLabel.qml
QGCMovableItem 1.0 QGCMovableItem.qml QGCMovableItem 1.0 QGCMovableItem.qml
QGCPipable 1.0 QGCPipable.qml
QGCRadioButton 1.0 QGCRadioButton.qml QGCRadioButton 1.0 QGCRadioButton.qml
QGCTextField 1.0 QGCTextField.qml QGCTextField 1.0 QGCTextField.qml
QGCToolBarButton 1.0 QGCToolBarButton.qml QGCToolBarButton 1.0 QGCToolBarButton.qml
......
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