From 472b2acf78f8d992416c5ee8ca8ac8853f36743e Mon Sep 17 00:00:00 2001
From: Remek Zajac <remek@airmap.com>
Date: Thu, 7 May 2020 12:56:36 +0200
Subject: [PATCH] review comment

---
 src/MissionManager/MissionController.cc  |  5 ++---
 src/Settings/PlanView.SettingsGroup.json | 11 ++++-------
 src/Settings/PlanViewSettings.cc         |  2 +-
 src/Settings/PlanViewSettings.h          |  2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc
index 61ce47bf4..da061ffe5 100644
--- a/src/MissionManager/MissionController.cc
+++ b/src/MissionManager/MissionController.cc
@@ -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()
 
         // 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;
         }
 
diff --git a/src/Settings/PlanView.SettingsGroup.json b/src/Settings/PlanView.SettingsGroup.json
index 851438c55..170f53ddd 100644
--- a/src/Settings/PlanView.SettingsGroup.json
+++ b/src/Settings/PlanView.SettingsGroup.json
@@ -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
 }
 ]
diff --git a/src/Settings/PlanViewSettings.cc b/src/Settings/PlanViewSettings.cc
index 608cb3268..015ce7a80 100644
--- a/src/Settings/PlanViewSettings.cc
+++ b/src/Settings/PlanViewSettings.cc
@@ -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)
diff --git a/src/Settings/PlanViewSettings.h b/src/Settings/PlanViewSettings.h
index 34bb984fa..e00637f54 100644
--- a/src/Settings/PlanViewSettings.h
+++ b/src/Settings/PlanViewSettings.h
@@ -25,5 +25,5 @@ public:
     DEFINE_SETTINGFACT(showMissionItemStatus)
     DEFINE_SETTINGFACT(useConditionGate)
     DEFINE_SETTINGFACT(takeoffItemNotRequired)
-    DEFINE_SETTINGFACT(showGimbalWhen)
+    DEFINE_SETTINGFACT(showGimbalOnlyWhenSet)
 };
-- 
2.22.0