Skip to content

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

Done with first pass of the Flight View re-work.

parent a9a17e88
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 375 additions and 336 deletions
qgroundcontrol.qrc
View file @ b14e1a46
...@@ -77,11 +77,14 @@ ...@@ -77,11 +77,14 @@
<file alias="FlightDisplayView.qml">src/FlightDisplay/FlightDisplayView.qml</file> <file alias="FlightDisplayView.qml">src/FlightDisplay/FlightDisplayView.qml</file>
<file alias="FlightDisplayWidget.qml">src/FlightDisplay/FlightDisplayWidget.qml</file> <file alias="FlightDisplayWidget.qml">src/FlightDisplay/FlightDisplayWidget.qml</file>
<file alias="MissionEditor.qml">src/MissionEditor/MissionEditor.qml</file> <file alias="MissionEditor.qml">src/MissionEditor/MissionEditor.qml</file>
<file alias="MissionEditorHelp.qml">src/MissionEditor/MissionEditorHelp.qml</file>
<!-- FlightDisplay module --> <!-- FlightDisplay module -->
<file alias="QGroundControl/FlightDisplay/qmldir">src/FlightDisplay/qmldir</file> <file alias="QGroundControl/FlightDisplay/qmldir">src/FlightDisplay/qmldir</file>
<file alias="QGroundControl/FlightDisplay/FlightDisplayView.qml">src/FlightDisplay/FlightDisplayView.qml</file> <file alias="QGroundControl/FlightDisplay/FlightDisplayView.qml">src/FlightDisplay/FlightDisplayView.qml</file>
<file alias="QGroundControl/FlightDisplay/FlightDisplayViewDelayLoad.qml">src/FlightDisplay/FlightDisplayViewDelayLoad.qml</file> <file alias="QGroundControl/FlightDisplay/FlightDisplayViewMap.qml">src/FlightDisplay/FlightDisplayViewMap.qml</file>
<file alias="QGroundControl/FlightDisplay/FlightDisplayViewVideo.qml">src/FlightDisplay/FlightDisplayViewVideo.qml</file>
<file alias="QGroundControl/FlightDisplay/FlightDisplayViewWidgets.qml">src/FlightDisplay/FlightDisplayViewWidgets.qml</file>
<!-- FlightMap module --> <!-- FlightMap module -->
<file alias="QGroundControl/FlightMap/qmldir">src/FlightMap/qmldir</file> <file alias="QGroundControl/FlightMap/qmldir">src/FlightMap/qmldir</file>
......
src/FlightDisplay/FlightDisplayView.qml
View file @ b14e1a46
...@@ -41,16 +41,6 @@ import QGroundControl.Controllers 1.0 ...@@ -41,16 +41,6 @@ import QGroundControl.Controllers 1.0
Item { Item {
id: root id: root
property alias latitude: flightMap.latitude
property alias longitude: flightMap.longitude
// Top margin for all widgets. Used to prevent overlap with the toolbar
property real topMargin: 0
// Used by parent to hide widgets when it displays something above in the z order.
// Prevents z order drawing problems.
property bool hideWidgets: false
QGCPalette { id: qgcPal; colorGroupEnabled: enabled } QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
property var _activeVehicle: multiVehicleManager.activeVehicle property var _activeVehicle: multiVehicleManager.activeVehicle
...@@ -64,139 +54,117 @@ Item { ...@@ -64,139 +54,117 @@ Item {
readonly property real _defaultAirSpeed: 0 readonly property real _defaultAirSpeed: 0
readonly property real _defaultClimbRate: 0 readonly property real _defaultClimbRate: 0
readonly property string _mapName: "FlightDisplayView" readonly property string _mapName: "FlightDisplayView"
readonly property string _showMapBackgroundKey: "/showMapBackground" readonly property string _showMapBackgroundKey: "/showMapBackground"
readonly property var _flightMap: flightMap property bool _mainIsMap: !_controller.hasVideo
property real _roll: _activeVehicle ? (isNaN(_activeVehicle.roll) ? _defaultRoll : _activeVehicle.roll) : _defaultRoll property real _roll: _activeVehicle ? (isNaN(_activeVehicle.roll) ? _defaultRoll : _activeVehicle.roll) : _defaultRoll
property real _pitch: _activeVehicle ? (isNaN(_activeVehicle.pitch) ? _defaultPitch : _activeVehicle.pitch) : _defaultPitch property real _pitch: _activeVehicle ? (isNaN(_activeVehicle.pitch) ? _defaultPitch : _activeVehicle.pitch) : _defaultPitch
property real _heading: _activeVehicle ? (isNaN(_activeVehicle.heading) ? _defaultHeading : _activeVehicle.heading) : _defaultHeading property real _heading: _activeVehicle ? (isNaN(_activeVehicle.heading) ? _defaultHeading : _activeVehicle.heading) : _defaultHeading
property var _vehicleCoordinate: _activeVehicle ? (_activeVehicle.coordinateValid ? _activeVehicle.coordinate : _defaultVehicleCoordinate) : _defaultVehicleCoordinate property var _vehicleCoordinate: _activeVehicle ? (_activeVehicle.coordinateValid ? _activeVehicle.coordinate : _defaultVehicleCoordinate) : _defaultVehicleCoordinate
property real _altitudeWGS84: _activeVehicle ? _activeVehicle.altitudeWGS84 : _defaultAltitudeWGS84 property real _altitudeWGS84: _activeVehicle ? _activeVehicle.altitudeWGS84 : _defaultAltitudeWGS84
property real _groundSpeed: _activeVehicle ? _activeVehicle.groundSpeed : _defaultGroundSpeed property real _groundSpeed: _activeVehicle ? _activeVehicle.groundSpeed : _defaultGroundSpeed
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 bool _showMap: getBool(QGroundControl.flightMapSettings.loadMapSetting(flightMap.mapName, _showMapBackgroundKey, "1")) property var _flightMap: null
property var _flightVideo: null
property var _savedZoomLevel: 0
FlightDisplayViewController { id: _controller } FlightDisplayViewController { id: _controller }
MissionController { MissionController {
id: _missionController id: _missionController
Component.onCompleted: start(false /* editMode */) Component.onCompleted: start(false /* editMode */)
} }
ExclusiveGroup { function reloadContents() {
id: _dropButtonsExclusiveGroup if(_flightVideo) {
_flightVideo.visible = false
}
if(_mainIsMap) {
mainLoader.source = "FlightDisplayViewMap.qml"
pipLoader.source = "FlightDisplayViewVideo.qml"
} else {
mainLoader.source = "FlightDisplayViewVideo.qml"
pipLoader.source = "FlightDisplayViewMap.qml"
}
} }
// Validate _showMap setting
Component.onCompleted: { Component.onCompleted: {
delayLoader.source = "FlightDisplayViewDelayLoad.qml" reloadContents();
widgetsLoader.source = "FlightDisplayViewWidgets.qml"
// We have to be careful to not reference root properties in a function which is in a subcomponent
// until the root component has completed loading. Otherwise you get undefined references.
flightMap.rootLoadCompleted = true
flightMap.updateMapPosition(true /* force */)
_setShowMap(_showMap)
}
function getBool(value) {
return value === '0' ? false : true;
} }
function setBool(value) { //-- Main Window
return value ? "1" : "0"; Loader {
} id: mainLoader
anchors.fill: parent
function _setShowMap(showMap) { onLoaded: {
_showMap = _controller.hasVideo ? showMap : true if(_mainIsMap) {
QGroundControl.flightMapSettings.saveMapSetting(flightMap.mapName, _showMapBackgroundKey, setBool(_showMap)) _flightMap = item
} if(_savedZoomLevel != 0)
_flightMap.zoomLevel = _savedZoomLevel
FlightMap { else
id: flightMap _savedZoomLevel = _flightMap.zoomLevel
anchors.fill: parent _flightMap.updateMapPosition(true /* force */)
mapName: _mapName } else {
visible: _showMap _flightVideo = item
latitude: root._defaultCoordinate.latitude _flightVideo.visible = true
longitude: root._defaultCoordinate.longitude
property var rootVehicleCoordinate: _vehicleCoordinate
property bool rootLoadCompleted: false
property bool _followVehicle: true
onRootVehicleCoordinateChanged: updateMapPosition(false /* force */)
function updateMapPosition(force) {
if ((_followVehicle || force) && rootLoadCompleted) {
flightMap.latitude = root._vehicleCoordinate.latitude
flightMap.longitude = root._vehicleCoordinate.longitude
} }
} }
}
// Home position //-- PIP Window
MissionItemIndicator { Rectangle {
label: "H" id: pip
coordinate: (_activeVehicle && _activeVehicle.homePositionAvailable) ? _activeVehicle.homePosition : QtPositioning.coordinate(0, 0) visible: _controller.hasVideo
visible: _activeVehicle ? _activeVehicle.homePositionAvailable : false anchors.margins: ScreenTools.defaultFontPixelHeight
z: QGroundControl.zOrderMapItems anchors.left: parent.left
} anchors.bottom: parent.bottom
height: ScreenTools.defaultFontPixelSize * (9)
// Add trajectory points to the map width: ScreenTools.defaultFontPixelSize * (9) * (16/9)
MapItemView { color: "#000010"
model: multiVehicleManager.activeVehicle ? multiVehicleManager.activeVehicle.trajectoryPoints : 0 border.width: 4
radius: 4
delegate: border.color: {
MapPolyline { if(_mainIsMap && _flightMap != null)
line.width: 3 return _flightMap.isSatelliteMap ? Qt.rgba(1,1,1,0.75) : Qt.rgba(0,0,0,0.75)
line.color: "orange" else
z: QGroundControl.zOrderMapItems - 1 return Qt.rgba(0,0,0,0.75)
path: [
{ latitude: object.coordinate1.latitude, longitude: object.coordinate1.longitude },
{ latitude: object.coordinate2.latitude, longitude: object.coordinate2.longitude },
]
}
} }
Loader {
// Add the vehicles to the map id: pipLoader
MapItemView { anchors.fill: parent
model: multiVehicleManager.vehicles anchors.margins: 2
onLoaded: {
delegate: if(_mainIsMap) {
VehicleMapItem { _flightVideo = item
vehicle: object _flightVideo.visible = true
coordinate: object.coordinate } else {
isSatellite: flightMap.isSatelliteMap _flightMap = item
z: QGroundControl.zOrderMapItems _savedZoomLevel = _flightMap.zoomLevel
_flightMap.zoomLevel = _savedZoomLevel - 3
} }
pip.visible = _controller.hasVideo
}
} }
// Add the mission items to the map
MissionItemView {
model: _missionController.missionItems
}
// Add lines between waypoints
MissionLineView {
model: _missionController.waypointLines
}
// Used to make pinch zoom work
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
onClicked: {
_mainIsMap = !_mainIsMap
pip.visible = false
reloadContents();
}
} }
} // Flight Map }
//-- Widgets
Loader { Loader {
id: delayLoader id: widgetsLoader
anchors.fill: parent anchors.fill: parent
} }
} }
src/FlightDisplay/qmldir
View file @ b14e1a46
Module QGroundControl.FlightDisplay Module QGroundControl.FlightDisplay
FlightDisplayView 1.0 FlightDisplayView.qml FlightDisplayView 1.0 FlightDisplayView.qml
FlightDisplayViewDelayLoad 1.0 FlightDisplayViewDelayLoad.qml
src/FlightMap/FlightMap.qml
View file @ b14e1a46
...@@ -49,7 +49,7 @@ Map { ...@@ -49,7 +49,7 @@ Map {
property bool interactive: true property bool interactive: true
property string mapName: 'defaultMap' property string mapName: 'defaultMap'
property string mapType: QGroundControl.flightMapSettings.mapTypeForMapName(mapName) property string mapType: QGroundControl.flightMapSettings.mapTypeForMapName(mapName)
property alias mapWidgets: controlWidgets // property alias mapWidgets: controlWidgets
property bool isSatelliteMap: mapType == "Satellite Map" || mapType == "Hybrid Map" property bool isSatelliteMap: mapType == "Satellite Map" || mapType == "Hybrid Map"
property real lon: (longitude >= -180 && longitude <= 180) ? longitude : 0 property real lon: (longitude >= -180 && longitude <= 180) ? longitude : 0
...@@ -80,6 +80,7 @@ Map { ...@@ -80,6 +80,7 @@ Map {
} }
} }
/*********************************************
/// Map control widgets /// Map control widgets
Column { Column {
id: controlWidgets id: controlWidgets
...@@ -151,6 +152,7 @@ Map { ...@@ -151,6 +152,7 @@ Map {
} }
} // Row - +/- buttons } // Row - +/- buttons
} // Column - Map control widgets } // Column - Map control widgets
*********************************************/
/* /*
The slider and scale display are commented out for now to try to save real estate - DonLakeFlyer The slider and scale display are commented out for now to try to save real estate - DonLakeFlyer
......
src/FlightMap/Images/ZoomMinus.svg
View file @ b14e1a46
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 72 72" enable-background="new 0 0 72 72" xml:space="preserve"> viewBox="-269 361 72 72" style="enable-background:new -269 361 72 72;" xml:space="preserve">
<circle fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" cx="29.573" cy="30.04" r="22.416"/> <style type="text/css">
<line fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" x1="64.8" y1="64.83" x2="45.801" y2="45.765"/> .st0{fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;}
<line fill="none" x1="16.973" y1="30.04" x2="42.173" y2="30.04"/> .st1{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-miterlimit:10;}
<line fill="none" stroke="#FFFFFF" stroke-width="5" stroke-miterlimit="10" x1="16.973" y1="30.134" x2="42.173" y2="29.946"/> .st2{fill:none;}
.st3{fill:none;stroke:#FFFFFF;stroke-width:5;stroke-miterlimit:10;}
</style>
<circle class="st0" cx="-236.2" cy="393.9" r="11.2"/>
<line class="st1" x1="-218.6" y1="411.3" x2="-228.1" y2="401.8"/>
<line class="st2" x1="-242.5" y1="393.9" x2="-229.9" y2="393.9"/>
<line class="st3" x1="-242.5" y1="394" x2="-229.9" y2="393.9"/>
</svg> </svg>
src/FlightMap/Images/ZoomPlus.svg
View file @ b14e1a46
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 72 72" enable-background="new 0 0 72 72" xml:space="preserve"> viewBox="-269 361 72 72" style="enable-background:new -269 361 72 72;" xml:space="preserve">
<circle fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" cx="29.573" cy="30.04" r="22.416"/> <style type="text/css">
<line fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" x1="64.8" y1="64.83" x2="45.801" y2="45.765"/> .st0{fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;}
<path fill="#FFFFFF" d="M27.36,42.653V32.187H16.973v-4.374H27.36V17.426h4.426v10.387h10.387v4.374H31.786v10.466H27.36z"/> .st1{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-miterlimit:10;}
.st2{fill:#FFFFFF;}
</style>
<circle class="st0" cx="-236.2" cy="393.9" r="11.2"/>
<line class="st1" x1="-218.6" y1="411.3" x2="-228.1" y2="401.8"/>
<path class="st2" d="M-237.3,400.2V395h-5.2v-2.2h5.2v-5.2h2.2v5.2h5.2v2.2h-5.2v5.2H-237.3z"/>
</svg> </svg>
src/FlightMap/MapItems/VehicleMapItem.qml
View file @ b14e1a46
...@@ -33,8 +33,9 @@ import QGroundControl.Vehicle 1.0 ...@@ -33,8 +33,9 @@ import QGroundControl.Vehicle 1.0
/// Marker for displaying a vehicle location on the map /// Marker for displaying a vehicle location on the map
MapQuickItem { MapQuickItem {
property var vehicle ///< Vehicle object property var vehicle ///< Vehicle object
property bool isSatellite: false ///< true: satellite map is showing property bool isSatellite: false ///< true: satellite map is showing
property real size: ScreenTools.defaultFontPixelHeight * 5
anchorPoint.x: vehicleIcon.width / 2 anchorPoint.x: vehicleIcon.width / 2
anchorPoint.y: vehicleIcon.height / 2 anchorPoint.y: vehicleIcon.height / 2
...@@ -44,7 +45,7 @@ MapQuickItem { ...@@ -44,7 +45,7 @@ MapQuickItem {
id: vehicleIcon id: vehicleIcon
source: isSatellite ? "/qmlimages/airplaneOpaque.svg" : "/qmlimages/airplaneOutline.svg" source: isSatellite ? "/qmlimages/airplaneOpaque.svg" : "/qmlimages/airplaneOutline.svg"
mipmap: true mipmap: true
width: ScreenTools.defaultFontPixelHeight * 5 width: size
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
transform: Rotation { transform: Rotation {
......
src/FlightMap/Widgets/QGCInstrumentWidget.qml
View file @ b14e1a46
...@@ -36,21 +36,26 @@ Item { ...@@ -36,21 +36,26 @@ Item {
id: root id: root
height: size height: size
property alias heading: compass.heading property alias heading: compass.heading
property alias active: attitude.active property alias rollAngle: attitude.rollAngle
property alias rollAngle: attitude.rollAngle property alias pitchAngle: attitude.pitchAngle
property alias pitchAngle: attitude.pitchAngle
property real size: ScreenTools.defaultFontPixelSize * (10)
property real size: ScreenTools.defaultFontPixelSize * (10)
property bool isSatellite: false
property bool active: false
property bool _isVisible: true
//-- Instrument Pannel
Rectangle { Rectangle {
id: instrumentPannel id: instrumentPannel
anchors.left: parent.left anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
height: root.size height: root.size
width: instruments.width + 8 width: instruments.width + 8
radius: root.size / 2 radius: root.size / 2
color: Qt.rgba(0,0,0,0.5) visible: _isVisible
color: isSatellite ? Qt.rgba(1,1,1,0.5) : Qt.rgba(0,0,0,0.5)
Row { Row {
id: instruments id: instruments
height: parent.height height: parent.height
...@@ -59,14 +64,49 @@ Item { ...@@ -59,14 +64,49 @@ Item {
QGCAttitudeWidget { QGCAttitudeWidget {
id: attitude id: attitude
size: parent.height * 0.9 size: parent.height * 0.9
active: root.active
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
QGCCompassWidget { QGCCompassWidget {
id: compass id: compass
size: parent.height * 0.9 size: parent.height * 0.9
active: root.active
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
} }
MouseArea {
anchors.fill: parent
onClicked: {
_isVisible = !_isVisible
}
}
}
//-- Show Instruments
Rectangle {
id: openButton
anchors.right: parent.right
anchors.bottom: parent.bottom
height: 24
width: 24
radius: 4
visible: !_isVisible
color: isSatellite ? Qt.rgba(1,1,1,0.5) : Qt.rgba(0,0,0,0.5)
Image {
width: parent.width * 0.75
height: parent.height * 0.75
source: "/qmlimages/buttonLeft.svg"
mipmap: true
fillMode: Image.PreserveAspectFit
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
MouseArea {
anchors.fill: parent
onClicked: {
_isVisible = !_isVisible
}
}
} }
} }
src/MissionEditor/MissionEditor.qml
View file @ b14e1a46
This diff is collapsed.
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