Browse Source

Merge pull request #8729 from airmap/gimbal-yaw-indicators

Introduce gimbal yaw visiblity setting
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
18623e92cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/MissionManager/MissionController.cc
  2. 14
      src/Settings/PlanView.SettingsGroup.json
  3. 1
      src/Settings/PlanViewSettings.cc
  4. 1
      src/Settings/PlanViewSettings.h

4
src/MissionManager/MissionController.cc

@ -1513,11 +1513,11 @@ void MissionController::_recalcMissionFlightStatus()
// Look for specific gimbal changes // Look for specific gimbal changes
double gimbalYaw = item->specifiedGimbalYaw(); double gimbalYaw = item->specifiedGimbalYaw();
if (!qIsNaN(gimbalYaw)) { if (!qIsNaN(gimbalYaw) || _planViewSettings->showGimbalOnlyWhenSet()->rawValue().toBool()) {
_missionFlightStatus.gimbalYaw = gimbalYaw; _missionFlightStatus.gimbalYaw = gimbalYaw;
} }
double gimbalPitch = item->specifiedGimbalPitch(); double gimbalPitch = item->specifiedGimbalPitch();
if (!qIsNaN(gimbalPitch)) { if (!qIsNaN(gimbalPitch) || _planViewSettings->showGimbalOnlyWhenSet()->rawValue().toBool()) {
_missionFlightStatus.gimbalPitch = gimbalPitch; _missionFlightStatus.gimbalPitch = gimbalPitch;
} }

14
src/Settings/PlanView.SettingsGroup.json

@ -28,10 +28,16 @@
"defaultValue": false "defaultValue": false
}, },
{ {
"name": "useConditionGate", "name": "useConditionGate",
"shortDescription": "Use MAV_CMD_CONDITION_GATE for pattern generation", "shortDescription": "Use MAV_CMD_CONDITION_GATE for pattern generation",
"type": "bool", "type": "bool",
"defaultValue": false "defaultValue": false
},
{
"name": "showGimbalOnlyWhenSet",
"shortDescription": "Show gimbal yaw visual only when set explicitly for the waypoint",
"type": "bool",
"defaultValue": false
} }
] ]
} }

1
src/Settings/PlanViewSettings.cc

@ -22,3 +22,4 @@ DECLARE_SETTINGSFACT(PlanViewSettings, aboveTerrainWarning)
DECLARE_SETTINGSFACT(PlanViewSettings, showMissionItemStatus) DECLARE_SETTINGSFACT(PlanViewSettings, showMissionItemStatus)
DECLARE_SETTINGSFACT(PlanViewSettings, useConditionGate) DECLARE_SETTINGSFACT(PlanViewSettings, useConditionGate)
DECLARE_SETTINGSFACT(PlanViewSettings, takeoffItemNotRequired) DECLARE_SETTINGSFACT(PlanViewSettings, takeoffItemNotRequired)
DECLARE_SETTINGSFACT(PlanViewSettings, showGimbalOnlyWhenSet)

1
src/Settings/PlanViewSettings.h

@ -25,4 +25,5 @@ public:
DEFINE_SETTINGFACT(showMissionItemStatus) DEFINE_SETTINGFACT(showMissionItemStatus)
DEFINE_SETTINGFACT(useConditionGate) DEFINE_SETTINGFACT(useConditionGate)
DEFINE_SETTINGFACT(takeoffItemNotRequired) DEFINE_SETTINGFACT(takeoffItemNotRequired)
DEFINE_SETTINGFACT(showGimbalOnlyWhenSet)
}; };

Loading…
Cancel
Save