Browse Source

review comment

QGC4.4
Remek Zajac 5 years ago
parent
commit
472b2acf78
  1. 5
      src/MissionManager/MissionController.cc
  2. 11
      src/Settings/PlanView.SettingsGroup.json
  3. 2
      src/Settings/PlanViewSettings.cc
  4. 2
      src/Settings/PlanViewSettings.h

5
src/MissionManager/MissionController.cc

@ -1464,7 +1464,6 @@ void MissionController::_recalcMissionFlightStatus() @@ -1464,7 +1464,6 @@ void MissionController::_recalcMissionFlightStatus()
bool foundRTL = false;
bool vehicleYawSpecificallySet = false;
double totalHorizontalDistance = 0;
bool showGimbalOnlyWhenSet = _planViewSettings->showGimbalWhen()->enumStringValue() == "Set";
for (int i=0; i<_visualItems->count(); i++) {
VisualMissionItem* item = qobject_cast<VisualMissionItem*>(_visualItems->get(i));
@ -1512,11 +1511,11 @@ void MissionController::_recalcMissionFlightStatus() @@ -1512,11 +1511,11 @@ void MissionController::_recalcMissionFlightStatus()
// Look for specific gimbal changes
double gimbalYaw = item->specifiedGimbalYaw();
if (!qIsNaN(gimbalYaw) || showGimbalOnlyWhenSet) {
if (!qIsNaN(gimbalYaw) || _planViewSettings->showGimbalOnlyWhenSet()->rawValue().toBool()) {
_missionFlightStatus.gimbalYaw = gimbalYaw;
}
double gimbalPitch = item->specifiedGimbalPitch();
if (!qIsNaN(gimbalPitch) || showGimbalOnlyWhenSet) {
if (!qIsNaN(gimbalPitch) || _planViewSettings->showGimbalOnlyWhenSet()->rawValue().toBool()) {
_missionFlightStatus.gimbalPitch = gimbalPitch;
}

11
src/Settings/PlanView.SettingsGroup.json

@ -30,12 +30,9 @@ @@ -30,12 +30,9 @@
"defaultValue": false
},
{
"name": "showGimbalWhen",
"shortDescription": "Show gimbal yaw visual when yaw known/set",
"longDescription": "Shows the gimbal yaw when the it's explcitly set by the user or simply when known (propagated from previous)",
"type": "uint32",
"enumValues": "0,1",
"enumStrings": "Known,Set",
"defaultValue": 0
"name": "showGimbalOnlyWhenSet",
"shortDescription": "Show gimbal yaw visual only when set explicitly for the waypoint",
"type": "bool",
"defaultValue": false
}
]

2
src/Settings/PlanViewSettings.cc

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

2
src/Settings/PlanViewSettings.h

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

Loading…
Cancel
Save