Commit 076fa463 authored by Pierre TILAK's avatar Pierre TILAK

Hide Indicators in MultiVehicleList + Fix

Fix : COGAngle indicator was shown everytime, fix isCOGAngleOK
parent aa6fb469
...@@ -135,6 +135,7 @@ Item { ...@@ -135,6 +135,7 @@ Item {
QGCCompassWidget { QGCCompassWidget {
size: _widgetHeight size: _widgetHeight
usedByMultipleVehicleList: true
vehicle: _vehicle vehicle: _vehicle
} }
......
...@@ -40,16 +40,20 @@ Item { ...@@ -40,16 +40,20 @@ Item {
property real _headingToNextWP: vehicle ? vehicle.headingToNextWP.rawValue : 0 property real _headingToNextWP: vehicle ? vehicle.headingToNextWP.rawValue : 0
property real _courseOverGround:activeVehicle ? activeVehicle.gps.courseOverGround.rawValue : 0 property real _courseOverGround:activeVehicle ? activeVehicle.gps.courseOverGround.rawValue : 0
property bool usedByMultipleVehicleList: false
function isCOGAngleOK(){ function isCOGAngleOK(){
if(_groundSpeed < 0.5 && _showAdditionalIndicatorsCompass){ if(_groundSpeed < 0.5){
return false return false
} }
else{ else{
return vehicle return vehicle && _showAdditionalIndicatorsCompass
} }
} }
function isHeadingHomeOK(){ function isHeadingHomeOK(){
console.log('isHeadingHomeOK',vehicle && _showAdditionalIndicatorsCompass && !isNaN(_headingToHome))
console.log('headingHome',_headingToHome)
return vehicle && _showAdditionalIndicatorsCompass && !isNaN(_headingToHome) return vehicle && _showAdditionalIndicatorsCompass && !isNaN(_headingToHome)
} }
...@@ -61,7 +65,7 @@ Item { ...@@ -61,7 +65,7 @@ Item {
return _lockNoseUpCompass return _lockNoseUpCompass
} }
readonly property bool _showAdditionalIndicatorsCompass: QGroundControl.settingsManager.flyViewSettings.showAdditionalIndicatorsCompass.value readonly property bool _showAdditionalIndicatorsCompass: QGroundControl.settingsManager.flyViewSettings.showAdditionalIndicatorsCompass.value && !usedByMultipleVehicleList
readonly property bool _lockNoseUpCompass: QGroundControl.settingsManager.flyViewSettings.lockNoseUpCompass.value readonly property bool _lockNoseUpCompass: QGroundControl.settingsManager.flyViewSettings.lockNoseUpCompass.value
QGCPalette { id: qgcPal; colorGroupEnabled: enabled } QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
......
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