From 0fa317d96f72554ddea5e76bcfc3a8df6ef270ee Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Tue, 17 May 2022 11:40:19 -0400
Subject: [PATCH] Fixes to comments on pull request

---
 include/openspace/engine/openspaceengine.h |  2 +-
 scripts/developer_settings.lua             |  6 +++---
 src/engine/openspaceengine.cpp             | 14 ++++++++------
 src/properties/optionproperty.cpp          |  6 ++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 285fee72ba..83b6209b01 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -25,9 +25,9 @@
 #ifndef __OPENSPACE_CORE___OPENSPACEENGINE___H__
 #define __OPENSPACE_CORE___OPENSPACEENGINE___H__
 
+#include <openspace/properties/optionproperty.h>
 #include <openspace/properties/propertyowner.h>
 #include <openspace/properties/property.h>
-#include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/scene/profile.h>
diff --git a/scripts/developer_settings.lua b/scripts/developer_settings.lua
index bb635aa13f..8957cd3911 100644
--- a/scripts/developer_settings.lua
+++ b/scripts/developer_settings.lua
@@ -1,4 +1,4 @@
-if(os.getenv("OPENSPACE_DEVELOPER"))
+if os.getenv("OPENSPACE_DEVELOPER")
 then
-   openspace.setPropertyValueSingle('OpenSpaceEngine.Visibility', 4)
-end 
\ No newline at end of file
+  openspace.setPropertyValueSingle('OpenSpaceEngine.PropertyVisibility', 4)
+end
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 03fb652632..faef75366d 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -126,8 +126,8 @@ namespace {
     };
 
     constexpr openspace::properties::Property::PropertyInfo VisibilityInfo = {
-        "Visibility",
-        "Visibility",
+        "PropertyVisibility",
+        "Property Visibility",
         "Hides or displays different settings in the GUI depending on how advanced they "
         "are."
     };
@@ -169,10 +169,12 @@ OpenSpaceEngine::OpenSpaceEngine()
 
     using Visibility = openspace::properties::Property::Visibility;
     _visibility.addOptions({
-    { static_cast<int>(Visibility::User), "User"},
-    { static_cast<int>(Visibility::Developer), "Developer"},
-    { static_cast<int>(Visibility::Hidden), "Everything"},
-        });
+        { static_cast<int>(Visibility::NoviceUser), "Novice User"},
+        { static_cast<int>(Visibility::User), "User"},
+        { static_cast<int>(Visibility::AdvancedUser), "Advanced User"},
+        { static_cast<int>(Visibility::Developer), "Developer"},
+        { static_cast<int>(Visibility::Hidden), "Everything"},
+    });
 }
 
 OpenSpaceEngine::~OpenSpaceEngine() {} // NOLINT
diff --git a/src/properties/optionproperty.cpp b/src/properties/optionproperty.cpp
index 0fe0f8b252..41fb74aeb6 100644
--- a/src/properties/optionproperty.cpp
+++ b/src/properties/optionproperty.cpp
@@ -112,11 +112,10 @@ void OptionProperty::setValue(int value) {
 }
 
 bool OptionProperty::hasOption() const {
-    int setValue = value();
     auto it = std::find_if(
         _options.begin(),
         _options.end(),
-        [setValue](const Option& option) {
+        [setValue = value()](const Option& option) {
             return option.value == setValue;
         }
     );
@@ -125,11 +124,10 @@ bool OptionProperty::hasOption() const {
 
 
 const OptionProperty::Option& OptionProperty::option() const {
-    int setValue = value();
     auto it = std::find_if(
         _options.begin(),
         _options.end(),
-        [setValue](const Option& option) {
+        [setValue = value()](const Option& option) {
             return option.value == setValue;
         }
     );