zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Subdue Aispace widget if no vehicle is connected 

Added an "unavailable" icon for when no vehicle is connected
Toggle restriction overlays (map) on/off based on the airspace widget being expanded/collapsed respectively
QGC4.4
Gus Grubba 7 years ago
parent
97d3383cf4
commit
0303f5e9c2
6 changed files with 39 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/Airmap/AirspaceControl.qml
  2. 6
      src/Airmap/README.md
  3. 1
      src/Airmap/airmap.qrc
  4. 8
      src/Airmap/images/unavailable.svg
  5. 2
      src/FlightDisplay/FlightDisplayViewWidgets.qml
  6. 35
      src/PlanView/PlanView.qml

10
src/Airmap/AirspaceControl.qml
Unescape View File

@ -33,6 +33,7 @@ Item { @@ -33,6 +33,7 @@ Item {
readonly property color _colorBrown: "#3c2b24"
readonly property color _colorLightBrown: "#5a4e49"
readonly property color _colorGray: "#615c61"
readonly property color _colorLightGray: "#a0a0a0"
readonly property color _colorMidBrown: "#3a322f"
readonly property color _colorYellow: "#d7c61d"
readonly property color _colorWhite: "#ffffff"
@ -81,13 +82,13 @@ Item { @@ -81,13 +82,13 @@ Item {
width: height
height: ScreenTools.defaultFontPixelWidth * 2.5
sourceSize.height: height
source: "qrc:/airmap/advisory-icon.svg"
color: _textColor
source: _activeVehicle ? "qrc:/airmap/advisory-icon.svg" : "qrc:/airmap/unavailable.svg"
color: _activeVehicle ? _textColor : _colorLightGray
anchors.verticalCenter: parent.verticalCenter
}
QGCLabel {
text: qsTr("Airspace")
color: _textColor
color: _activeVehicle ? _textColor : _colorLightGray
anchors.verticalCenter: parent.verticalCenter
}
Item {
@ -97,7 +98,7 @@ Item { @@ -97,7 +98,7 @@ Item {
AirspaceWeather {
iconHeight: ScreenTools.defaultFontPixelWidth * 2.5
visible: _activeVehicle && _activeVehicle.airspaceController.weatherInfo.valid
contentColor: _textColor
contentColor: _activeVehicle ? _textColor : _colorLightGray
anchors.verticalCenter: parent.verticalCenter
}
}
@ -107,6 +108,7 @@ Item { @@ -107,6 +108,7 @@ Item {
sourceSize.height: height
source: "qrc:/airmap/expand.svg"
color: _textColor
visible: _activeVehicle
anchors.right: parent.right
anchors.rightMargin: ScreenTools.defaultFontPixelWidth
anchors.verticalCenter: parent.verticalCenter

6
src/Airmap/README.md
Unescape View File

@ -4,5 +4,9 @@ @@ -4,5 +4,9 @@
* Traffic monitor timeout is now set to 2 minutes following instructions from Thomas Voß.
* Add a "Wrong Way" icon to the airspace widget when not connected
* Check rules sorting order
* Group rules jurisdictions
* ~Add a "Wrong Way" icon to the airspace widget when not connected~

1
src/Airmap/airmap.qrc
Unescape View File

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
<file alias="expand.svg">images/expand.svg</file>
<file alias="pencil.svg">images/pencil.svg</file>
<file alias="right-arrow.svg">images/right-arrow.svg</file>
<file alias="unavailable.svg">images/unavailable.svg</file>
</qresource>
<qresource prefix="/airmapweather">
<file alias="clear.svg">images/weather-icons/clear.svg</file>

8
src/Airmap/images/unavailable.svg
Unescape View File

@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="72px" height="72px" viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
<path d="M36,0C16.1,0,0,16.1,0,36s16.1,36,36,36c19.9,0,36-16.1,36-36S55.9,0,36,0z M36,12.2c4.4,0,8.5,1.2,12,3.2L15.4,48
c-2.1-3.5-3.2-7.6-3.2-12C12.2,22.9,22.9,12.2,36,12.2z M36,59.8c-4.4,0-8.5-1.2-12-3.2L56.6,24c2.1,3.5,3.2,7.6,3.2,12
C59.8,49.1,49.1,59.8,36,59.8z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 649 B

2
src/FlightDisplay/FlightDisplayViewWidgets.qml
Unescape View File

@ -29,7 +29,7 @@ Item { @@ -29,7 +29,7 @@ Item {
property var qgcView
property bool useLightColors
property var missionController
property bool showValues: true
property bool showValues: _activeVehicle ? !_activeVehicle.airspaceController.airspaceVisible : true
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property bool _isSatellite: _mainIsMap ? (_flightMap ? _flightMap.isSatelliteMap : true) : true

35
src/PlanView/PlanView.qml
Unescape View File

@ -97,9 +97,10 @@ QGCView { @@ -97,9 +97,10 @@ QGCView {
on_EnableAirMapChanged: {
if(QGroundControl.airmapSupported) {
if(_enableAirMap) {
planControlColapsed = true
_activeVehicle.airspaceController.airspaceVisible = true
if(!_activeVehicle) {
planControlColapsed = false
} else if(_enableAirMap) {
planControlColapsed = _activeVehicle.airspaceController.airspaceVisible
} else {
planControlColapsed = false
}
@ -165,8 +166,8 @@ QGCView { @@ -165,8 +166,8 @@ QGCView {
}
Connections {
target: _activeVehicle ? _activeVehicle.airspaceController : undefined
onColapsedChanged: {
target: _activeVehicle ? _activeVehicle.airspaceController : null
onAirspaceVisibleChanged: {
planControlColapsed = _activeVehicle.airspaceController.airspaceVisible
}
}
@ -535,12 +536,11 @@ QGCView { @@ -535,12 +536,11 @@ QGCView {
id: airspaceControl
width: parent.width
visible: _enableAirMap
showColapse: false
showColapse: true
}
//-------------------------------------------------------
// Mission Controls (Colapsed)
Rectangle {
id: planColapsed
width: parent.width
height: planControlColapsed ? colapsedRow.height + ScreenTools.defaultFontPixelHeight : 0
color: qgcPal.missionItemEditor
@ -553,16 +553,16 @@ QGCView { @@ -553,16 +553,16 @@ QGCView {
anchors.leftMargin: ScreenTools.defaultFontPixelWidth
anchors.verticalCenter: parent.verticalCenter
QGCColoredImage {
width: height
height: ScreenTools.defaultFontPixelWidth * 2.5
sourceSize.height: height
source: "qrc:/res/waypoint.svg"
color: qgcPal.text
width: height
height: ScreenTools.defaultFontPixelWidth * 2.5
sourceSize.height: height
source: "qrc:/res/waypoint.svg"
color: qgcPal.text
anchors.verticalCenter: parent.verticalCenter
}
QGCLabel {
text: qsTr("Plan")
color: qgcPal.text
text: qsTr("Plan")
color: qgcPal.text
anchors.verticalCenter: parent.verticalCenter
}
}
@ -581,8 +581,9 @@ QGCView { @@ -581,8 +581,9 @@ QGCView {
anchors.fill: parent
enabled: QGroundControl.airmapSupported
onClicked: {
airspaceControl.colapsed = true
planControlColapsed = false
if(_activeVehicle) {
_activeVehicle.airspaceController.airspaceVisible = false
}
}
}
}
@ -591,7 +592,7 @@ QGCView { @@ -591,7 +592,7 @@ QGCView {
Rectangle {
id: planExpanded
width: parent.width
height: !planControlColapsed ? expandedCol.height + ScreenTools.defaultFontPixelHeight : 0
height: (!planControlColapsed || !_enableAirMap) ? expandedCol.height + ScreenTools.defaultFontPixelHeight : 0
color: qgcPal.missionItemEditor
radius: _radius
visible: !planControlColapsed || !_enableAirMap

Write Preview
Loading…
Cancel
Save