From eb709b830cc91dd84f685e5464a928a50c82e14a Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Wed, 2 Apr 2025 09:28:11 +0200
Subject: [PATCH] Small option property cleanup (#3577)

* Notify change listeners

I can't come up with a reason for why we would not want to do this

* Remove the Display Type for OptionProperty (only used in ImGui)

* Replace extra boolean with internal anonymous addOption function

* Tiny refactor

* removed dropdown on a couple of more places

* Update optionproperty.cpp

---------

Co-authored-by: ElonOlsson <olssonelon@gmail.com>
---
 .../properties/misc/optionproperty.h          | 29 +-------
 modules/base/dashboard/dashboarditemangle.cpp | 15 +---
 .../base/dashboard/dashboarditemdistance.cpp  | 12 +---
 .../base/dashboard/dashboarditemframerate.cpp |  2 +-
 .../dashboarditemsimulationincrement.cpp      |  2 +-
 .../base/dashboard/dashboarditemvelocity.cpp  |  2 +-
 .../pointcloud/renderablepointcloud.cpp       |  5 +-
 .../pointcloud/sizemappingcomponent.cpp       |  5 +-
 .../rendering/renderabledistancelabel.cpp     |  2 +-
 modules/base/rendering/renderablelabel.cpp    | 12 +---
 modules/base/rendering/renderablemodel.cpp    |  5 +-
 modules/base/rendering/renderableplane.cpp    |  2 +-
 modules/base/rendering/renderablesphere.cpp   |  7 +-
 modules/base/rendering/renderabletrail.cpp    |  5 +-
 modules/base/rotation/fixedrotation.cpp       | 15 +---
 .../rendering/renderabledumeshes.cpp          |  2 +-
 .../renderablefieldlinessequence.cpp          |  9 +--
 .../gaia/rendering/renderablegaiastars.cpp    |  9 +--
 modules/galaxy/rendering/renderablegalaxy.cpp |  7 +-
 .../src/geojson/geojsoncomponent.cpp          |  5 +-
 .../src/geojson/geojsonproperties.cpp         | 10 +--
 .../src/globelabelscomponent.cpp              |  5 +-
 modules/globebrowsing/src/layer.cpp           |  4 +-
 modules/globebrowsing/src/layeradjustment.cpp |  2 +-
 modules/imgui/src/renderproperties.cpp        | 65 +++++++----------
 .../rendering/renderablekameleonvolume.cpp    |  2 +-
 .../space/rendering/renderablefluxnodes.cpp   |  8 +--
 .../rendering/renderableorbitalkepler.cpp     |  5 +-
 modules/space/rendering/renderablestars.cpp   | 14 ++--
 .../rendering/renderableshadowcylinder.cpp    |  5 +-
 .../rendering/renderabletimevaryingvolume.cpp |  2 +-
 src/navigation/pathnavigator.cpp              |  5 +-
 src/properties/misc/optionproperty.cpp        | 70 +++++++++----------
 src/rendering/colormappingcomponent.cpp       |  2 +-
 34 files changed, 115 insertions(+), 236 deletions(-)

diff --git a/include/openspace/properties/misc/optionproperty.h b/include/openspace/properties/misc/optionproperty.h
index 6507d43a45..a833bf4830 100644
--- a/include/openspace/properties/misc/optionproperty.h
+++ b/include/openspace/properties/misc/optionproperty.h
@@ -48,11 +48,6 @@ public:
         std::string description;
     };
 
-    enum class DisplayType {
-        Radio,
-        Dropdown
-    };
-
     /**
      * The constructor delegating the `identifier` and the `guiName` to its super class.
      *
@@ -64,18 +59,6 @@ public:
      */
     OptionProperty(Property::PropertyInfo info);
 
-    /**
-    * The constructor delegating the `identifier` and the `guiName` to its super class.
-    *
-    * \param info The PropertyInfo structure that contains all the required static
-    *        information for initializing this Property
-    * \param displayType Optional DisplayType for GUI (default RADIO)
-    *
-    * \pre \p info.identifier must not be empty
-    * \pre \p info.guiName must not be empty
-    */
-    OptionProperty(PropertyInfo info, DisplayType displayType);
-
     /**
      * Returns the name of the class for reflection purposes.
      *
@@ -86,21 +69,14 @@ public:
 
     using TemplateProperty<int>::operator=;
 
-    /**
-     * Returns the type for GUI display.
-     *
-     * \return OptionType for display purposes
-     */
-    DisplayType displayType() const;
-
     /**
      * Adds the passed option to the list of available options. The `value` of the
      * `option` must not have been registered previously, or a warning will be logged.
      *
      * \param value The option that will be added to the list of available options
-     * \param desc The description of the value that will be added
+     * \param description The description of the value that will be added
      */
-    void addOption(int value, std::string desc);
+    void addOption(int value, std::string description);
 
     /**
      * Adds multiple options to the OptionProperty. Each value in the vector consists of
@@ -171,7 +147,6 @@ private:
 
     /// The list of options which have been registered with this OptionProperty
     std::vector<Option> _options;
-    DisplayType _displayType;
 };
 
 } // namespace openspace::properties
diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp
index 03e8f1e986..1d10043267 100644
--- a/modules/base/dashboard/dashboarditemangle.cpp
+++ b/modules/base/dashboard/dashboarditemangle.cpp
@@ -143,26 +143,17 @@ documentation::Documentation DashboardItemAngle::Documentation() {
 DashboardItemAngle::DashboardItemAngle(const ghoul::Dictionary& dictionary)
     : DashboardTextItem(dictionary)
     , _source{
-        properties::OptionProperty(
-            SourceTypeInfo,
-            properties::OptionProperty::DisplayType::Dropdown
-        ),
+        properties::OptionProperty(SourceTypeInfo),
         properties::StringProperty(SourceNodeIdentifierInfo),
         nullptr
     }
     , _reference{
-        properties::OptionProperty(
-            ReferenceTypeInfo,
-            properties::OptionProperty::DisplayType::Dropdown
-        ),
+        properties::OptionProperty(ReferenceTypeInfo),
         properties::StringProperty(ReferenceNodeIdentifierInfo),
         nullptr
     }
     , _destination{
-        properties::OptionProperty(
-            DestinationTypeInfo,
-            properties::OptionProperty::DisplayType::Dropdown
-        ),
+        properties::OptionProperty(DestinationTypeInfo),
         properties::StringProperty(DestinationNodeIdentifierInfo),
         nullptr
     }
diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp
index 60961ed2a7..10407c9645 100644
--- a/modules/base/dashboard/dashboarditemdistance.cpp
+++ b/modules/base/dashboard/dashboarditemdistance.cpp
@@ -159,21 +159,15 @@ documentation::Documentation DashboardItemDistance::Documentation() {
 DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary)
     : DashboardTextItem(dictionary)
     , _doSimplification(SimplificationInfo, true)
-    , _requestedUnit(RequestedUnitInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _requestedUnit(RequestedUnitInfo)
     , _formatString(FormatStringInfo, "Distance from {} to {}: {:f} {}")
     , _source{
-        properties::OptionProperty(
-            SourceTypeInfo,
-            properties::OptionProperty::DisplayType::Dropdown
-        ),
+        properties::OptionProperty(SourceTypeInfo),
         properties::StringProperty(SourceNodeIdentifierInfo),
         nullptr
     }
     , _destination{
-        properties::OptionProperty(
-            DestinationTypeInfo,
-            properties::OptionProperty::DisplayType::Dropdown
-        ),
+        properties::OptionProperty(DestinationTypeInfo),
         properties::StringProperty(DestinationNodeIdentifierInfo),
         nullptr
     }
diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp
index e2274f14cb..554deca966 100644
--- a/modules/base/dashboard/dashboarditemframerate.cpp
+++ b/modules/base/dashboard/dashboarditemframerate.cpp
@@ -197,7 +197,7 @@ documentation::Documentation DashboardItemFramerate::Documentation() {
 
 DashboardItemFramerate::DashboardItemFramerate(const ghoul::Dictionary& dictionary)
     : DashboardTextItem(dictionary)
-    , _frametimeType(FrametimeInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _frametimeType(FrametimeInfo)
     , _clearCache(ClearCacheInfo)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.cpp b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
index 0daea282c3..35619779a3 100644
--- a/modules/base/dashboard/dashboarditemsimulationincrement.cpp
+++ b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
@@ -125,7 +125,7 @@ DashboardItemSimulationIncrement::DashboardItemSimulationIncrement(
                                                       const ghoul::Dictionary& dictionary)
     : DashboardTextItem(dictionary)
     , _doSimplification(SimplificationInfo, true)
-    , _requestedUnit(RequestedUnitInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _requestedUnit(RequestedUnitInfo)
     , _transitionFormat(
         TransitionFormatInfo,
         "Simulation increment: {:.1f} {:s} / second{:s} (current: {:.1f} {:s})"
diff --git a/modules/base/dashboard/dashboarditemvelocity.cpp b/modules/base/dashboard/dashboarditemvelocity.cpp
index c82b836448..3083f3fe43 100644
--- a/modules/base/dashboard/dashboarditemvelocity.cpp
+++ b/modules/base/dashboard/dashboarditemvelocity.cpp
@@ -84,7 +84,7 @@ documentation::Documentation DashboardItemVelocity::Documentation() {
 DashboardItemVelocity::DashboardItemVelocity(const ghoul::Dictionary& dictionary)
     : DashboardTextItem(dictionary)
     , _doSimplification(SimplificationInfo, true)
-    , _requestedUnit(RequestedUnitInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _requestedUnit(RequestedUnitInfo)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
     _doSimplification.onChange([this]() {
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index bba3f92ec3..e70b4d373f 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -637,10 +637,7 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
     , _useAdditiveBlending(UseAdditiveBlendingInfo, true)
     , _useRotation(UseOrientationDataInfo, false)
     , _drawElements(DrawElementsInfo, true)
-    , _renderOption(
-        OrientationRenderOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , _renderOption(OrientationRenderOptionInfo)
     , _nDataPoints(NumShownDataPointsInfo, 0)
     , _hasOrientationData(HasOrientationDataInfo, false)
 {
diff --git a/modules/base/rendering/pointcloud/sizemappingcomponent.cpp b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
index 9ec8000590..040f7116ce 100644
--- a/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
+++ b/modules/base/rendering/pointcloud/sizemappingcomponent.cpp
@@ -121,10 +121,7 @@ documentation::Documentation SizeMappingComponent::Documentation() {
 SizeMappingComponent::SizeMappingComponent()
     : properties::PropertyOwner({ "SizeMapping", "Size Mapping", "" })
     , enabled(EnabledInfo, true)
-    , parameterOption(
-        OptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , parameterOption(OptionInfo)
     , scaleFactor(ScaleFactorInfo, 1.f, 0.f, 1000.f)
     , isRadius(IsRadiusInfo, false)
 {
diff --git a/modules/base/rendering/renderabledistancelabel.cpp b/modules/base/rendering/renderabledistancelabel.cpp
index 23c12267cf..a9c81ad198 100644
--- a/modules/base/rendering/renderabledistancelabel.cpp
+++ b/modules/base/rendering/renderabledistancelabel.cpp
@@ -106,7 +106,7 @@ documentation::Documentation RenderableDistanceLabel::Documentation() {
 RenderableDistanceLabel::RenderableDistanceLabel(const ghoul::Dictionary& dictionary)
     : RenderableLabel(dictionary)
     , _nodelineId(NodeLineInfo)
-    , _distanceUnit(DistanceUnitInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _distanceUnit(DistanceUnitInfo)
     , _customUnitDescriptor(CustomUnitDescriptorInfo)
     , _precision(PrecisionInfo, 0, 0, 10)
 {
diff --git a/modules/base/rendering/renderablelabel.cpp b/modules/base/rendering/renderablelabel.cpp
index d8a1749775..8a412a8a1a 100644
--- a/modules/base/rendering/renderablelabel.cpp
+++ b/modules/base/rendering/renderablelabel.cpp
@@ -252,7 +252,7 @@ documentation::Documentation RenderableLabel::Documentation() {
 
 RenderableLabel::RenderableLabel(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary, { .automaticallyUpdateRenderBin = false })
-    , _blendMode(BlendModeInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _blendMode(BlendModeInfo)
     , _text(TextInfo, "")
     , _color(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , _fontSize(FontSizeInfo, 50.f, 1.f, 100.f)
@@ -261,14 +261,8 @@ RenderableLabel::RenderableLabel(const ghoul::Dictionary& dictionary)
     , _enableFadingEffect(EnableFadingEffectInfo, false)
     , _fadeWidths(FadeWidthsInfo, glm::vec2(1.f), glm::vec2(0.f), glm::vec2(100.f))
     , _fadeDistances(FadeDistancesInfo, glm::vec2(1.f), glm::vec2(0.f), glm::vec2(100.f))
-    , _fadeUnitOption(
-        FadeUnitOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
-    , _orientationOption(
-        OrientationOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , _fadeUnitOption(FadeUnitOptionInfo)
+    , _orientationOption(OrientationOptionInfo)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index d3b43fd3a7..86041d7875 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -295,10 +295,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
     , _modelScale(ModelScaleInfo, 1.0, std::numeric_limits<double>::epsilon(), 4e+27)
     , _rotationVec(RotationVecInfo, glm::dvec3(0.0), glm::dvec3(0.0), glm::dvec3(360.0))
     , _enableDepthTest(EnableDepthTestInfo, true)
-    , _blendingFuncOption(
-        BlendingOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , _blendingFuncOption(BlendingOptionInfo)
     , _lightSourcePropertyOwner({ "LightSources", "Light Sources" })
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index 23fdb2c641..fa91939b77 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -131,7 +131,7 @@ documentation::Documentation RenderablePlane::Documentation() {
 
 RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary, { .automaticallyUpdateRenderBin = false })
-    , _blendMode(BlendModeInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _blendMode(BlendModeInfo)
     , _billboard(BillboardInfo, false)
     , _mirrorBackside(MirrorBacksideInfo, false)
     , _size(SizeInfo, glm::vec2(10.f), glm::vec2(0.f), glm::vec2(1e25f))
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index c078e5948f..187957b834 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -180,15 +180,12 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _size(SizeInfo, 1.f, 0.f, 1e25f)
     , _segments(SegmentsInfo, 16, 4, 1000)
-    , _orientation(OrientationInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _orientation(OrientationInfo)
     , _mirrorTexture(MirrorTextureInfo, false)
     , _disableFadeInDistance(DisableFadeInOutInfo, false)
     , _fadeInThreshold(FadeInThresholdInfo, 0.f, 0.f, 1.f, 0.001f)
     , _fadeOutThreshold(FadeOutThresholdInfo, 0.f, 0.f, 1.f, 0.001f)
-    , _blendingFuncOption(
-        BlendingOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , _blendingFuncOption(BlendingOptionInfo)
     , _disableDepth(DisableDepthInfo, false)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 8a17fc88bc..939d7c043c 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -188,10 +188,7 @@ RenderableTrail::Appearance::Appearance()
     , useLineFade(EnableFadeInfo, true)
     , lineWidth(LineWidthInfo, 10.f, 1.f, 20.f)
     , pointSize(PointSizeInfo, 1, 1, 64)
-    , renderingModes(
-          RenderingModeInfo,
-          properties::OptionProperty::DisplayType::Dropdown
-    )
+    , renderingModes(RenderingModeInfo)
     , lineLength(LineLengthInfo, 1.f, 0.f, 1.f)
     , lineFadeAmount(LineFadeAmountInfo, 1.f, 0.f, 1.f)
 {
diff --git a/modules/base/rotation/fixedrotation.cpp b/modules/base/rotation/fixedrotation.cpp
index aab2a77ec1..f84de4bb1e 100644
--- a/modules/base/rotation/fixedrotation.cpp
+++ b/modules/base/rotation/fixedrotation.cpp
@@ -284,10 +284,7 @@ FixedRotation::FixedRotation(const ghoul::Dictionary& dictionary)
     : Rotation(dictionary)
     , _enabled(EnableInfo, true)
     , _xAxis{
-        properties::OptionProperty(
-            XAxisTypeInfo,
-            properties::OptionProperty::DisplayType::Dropdown
-        ),
+        properties::OptionProperty(XAxisTypeInfo),
         properties::StringProperty(XAxisObjectInfo, ""),
         properties::BoolProperty(XAxisInvertObjectInfo, false),
         properties::Vec3Property(
@@ -300,10 +297,7 @@ FixedRotation::FixedRotation(const ghoul::Dictionary& dictionary)
         nullptr
     }
     , _yAxis{
-        properties::OptionProperty(
-            YAxisTypeInfo,
-            properties::OptionProperty::DisplayType::Dropdown
-        ),
+        properties::OptionProperty(YAxisTypeInfo),
         properties::StringProperty(YAxisObjectInfo, ""),
         properties::BoolProperty(YAxisInvertObjectInfo, false),
         properties::Vec3Property(
@@ -316,10 +310,7 @@ FixedRotation::FixedRotation(const ghoul::Dictionary& dictionary)
         nullptr
     }
     , _zAxis{
-        properties::OptionProperty(
-            ZAxisTypeInfo,
-            properties::OptionProperty::DisplayType::Dropdown
-        ),
+        properties::OptionProperty(ZAxisTypeInfo),
         properties::StringProperty(ZAxisObjectInfo, ""),
         properties::BoolProperty(ZAxisInvertObjectInfo, false),
         properties::Vec3Property(
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index 530662b642..57a3f82dc3 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -192,7 +192,7 @@ RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
         glm::ivec2(1000)
     )
     , _lineWidth(LineWidthInfo, 2.f, 1.f, 16.f)
-    , _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _renderOption(RenderOptionInfo)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index 613876590c..cdd30c069f 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -300,8 +300,8 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(
                                                       const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _colorGroup({ "Color" })
-    , _colorMethod(ColorMethodInfo, properties::OptionProperty::DisplayType::Radio)
-    , _colorQuantity(ColorQuantityInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _colorMethod(ColorMethodInfo)
+    , _colorQuantity(ColorQuantityInfo)
     , _colorQuantityMinMax(
         ColorMinMaxInfo,
         glm::vec2(-0.f, 100.f),
@@ -342,10 +342,7 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(
         glm::vec2(-5000.f),
         glm::vec2(5000.f)
     )
-    , _maskingQuantity(
-        MaskingQuantityInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , _maskingQuantity(MaskingQuantityInfo)
     , _lineWidth(LineWidthInfo, 1.f, 1.f, 20.f)
     , _jumpToStartBtn(TimeJumpButtonInfo)
 {
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index a06bedc2a7..ecbb04f9b7 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -472,12 +472,9 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
     , _firstRow(FirstRowInfo, 0, 0, 2539913) // DR1-max: 2539913
     , _lastRow(LastRowInfo, 0, 0, 2539913)
     , _columnNamesList(ColumnNamesInfo)
-    , _fileReaderOption(
-        FileReaderOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
-    , _renderMode(RenderModeInfo, properties::OptionProperty::DisplayType::Dropdown)
-    , _shaderOption(ShaderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _fileReaderOption(FileReaderOptionInfo)
+    , _renderMode(RenderModeInfo)
+    , _shaderOption(ShaderOptionInfo)
     , _nRenderedStars(NumRenderedStarsInfo, 0, 0, 2000000000) // 2 Billion stars
     , _cpuRamBudgetProperty(CpuRamBudgetInfo, 0.f, 0.f, 1.f)
     , _gpuStreamBudgetProperty(GpuStreamBudgetInfo, 0.f, 0.f, 1.f)
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index 09de6217c0..09af424220 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -146,7 +146,7 @@ namespace {
         "The number of integration steps used during the raycasting procedure.",
         openspace::properties::Property::Visibility::AdvancedUser
     };
-    
+
     void saveCachedFile(const std::filesystem::path& file,
                         const std::vector<glm::vec3>& positions,
                         const std::vector<glm::vec3>& colors, int64_t nPoints,
@@ -254,10 +254,7 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary)
     , _stepSize(StepSizeInfo, 0.01f, 0.001f, 0.05f, 0.001f)
     , _absorptionMultiply(AbsorptionMultiplyInfo, 40.f, 0.f, 200.f)
     , _emissionMultiply(EmissionMultiplyInfo, 200.f, 0.f, 1000.f)
-    , _starRenderingMethod(
-        StarRenderingMethodInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , _starRenderingMethod(StarRenderingMethodInfo)
     , _enabledPointsRatio(EnabledPointsRatioInfo, 0.5f, 0.01f, 1.f)
     , _rotation(
         RotationInfo,
diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
index 0be69f4d40..09b2c02d36 100644
--- a/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.cpp
@@ -300,10 +300,7 @@ GeoJsonComponent::GeoJsonComponent(const ghoul::Dictionary& dictionary,
     )
     , _pointSizeScale(PointSizeScaleInfo, 1.f, 0.01f, 100.f)
     , _lineWidthScale(LineWidthScaleInfo, 1.f, 0.01f, 10.f)
-    , _pointRenderModeOption(
-        PointRenderModeInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , _pointRenderModeOption(PointRenderModeInfo)
     , _drawWireframe(DrawWireframeInfo, false)
     , _preventUpdatesFromHeightMap(PreventHeightUpdateInfo, false)
     , _forceUpdateHeightData(ForceUpdateHeightDataInfo)
diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
index 9d1609cdf8..b912684873 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
@@ -380,16 +380,10 @@ GeoJsonProperties::GeoJsonProperties()
     , lineWidth(LineWidthInfo, 2.f, 0.01f, 10.f)
     , pointSize(PointSizeInfo, 10.f, 0.01f, 100.f)
     , pointTexture(PointTextureInfo)
-    , pointAnchorOption(
-        PointAnchorOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , pointAnchorOption(PointAnchorOptionInfo)
     , extrude(ExtrudeInfo, false)
     , performShading(PerformShadingInfo, false)
-    , altitudeModeOption(
-        AltitudeModeInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , altitudeModeOption(AltitudeModeInfo)
 {
     addProperty(opacity);
     color.setViewOption(properties::Property::ViewOptions::Color);
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index 2381da8c6d..5e105646a4 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -280,10 +280,7 @@ GlobeLabelsComponent::GlobeLabelsComponent()
     , _fadeOutEnabled(FadeOutEnabledInfo, false)
     , _disableCulling(DisableCullingInfo, false)
     , _distanceEPS(DistanceEPSInfo, 100000.f, 1000.f, 10000000.f)
-    , _alignmentOption(
-        AlignmentOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , _alignmentOption(AlignmentOptionInfo)
 {
     addProperty(_enabled);
     addProperty(_color);
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index 7ae61c005a..299604e9f7 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -186,8 +186,8 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou
         layerDict.hasKey(KeyDesc) ? layerDict.value<std::string>(KeyDesc) : ""
     })
     , _parent(parent)
-    , _typeOption(TypeInfo, properties::OptionProperty::DisplayType::Dropdown)
-    , _blendModeOption(BlendModeInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _typeOption(TypeInfo)
+    , _blendModeOption(BlendModeInfo)
     , _enabled(EnabledInfo, false)
     , _reset(ResetInfo)
     , _remove(RemoveInfo)
diff --git a/modules/globebrowsing/src/layeradjustment.cpp b/modules/globebrowsing/src/layeradjustment.cpp
index ed6e9e996d..32aaea102c 100644
--- a/modules/globebrowsing/src/layeradjustment.cpp
+++ b/modules/globebrowsing/src/layeradjustment.cpp
@@ -80,7 +80,7 @@ LayerAdjustment::LayerAdjustment()
     : properties::PropertyOwner({ "Adjustment" })
     , _chromaKeyColor(ChromaKeyColorInfo, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(1.f))
     , _chromaKeyTolerance(ChromaKeyToleranceInfo, 0.f, 0.f, 1.f)
-    , _typeOption(TypeInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _typeOption(TypeInfo)
     , _typeId(static_cast<layers::Adjustment::ID>(_typeOption.value()))
 {
     // Add options to option properties
diff --git a/modules/imgui/src/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp
index 7f2443c779..31dcd3497f 100644
--- a/modules/imgui/src/renderproperties.cpp
+++ b/modules/imgui/src/renderproperties.cpp
@@ -110,48 +110,33 @@ void renderOptionProperty(Property* prop, const std::string& ownerName,
 
     int value = *p;
     const std::vector<OptionProperty::Option>& options = p->options();
-    switch (p->displayType()) {
-        case OptionProperty::DisplayType::Radio:
-            ImGui::Text("%s", name.c_str());
-            ImGui::Separator();
-            for (const OptionProperty::Option& o : options) {
-                ImGui::RadioButton(o.description.c_str(), &value, o.value);
-                if (showTooltip) {
-                    renderTooltip(prop, tooltipDelay);
-                }
-            }
-            ImGui::Separator();
-            break;
-        case OptionProperty::DisplayType::Dropdown: {
-            // The order of the options does not have to correspond with the value of the
-            // option
-            std::string nodeNames;
-            for (const OptionProperty::Option& o : options) {
-                nodeNames += o.description + '\0';
-            }
-            nodeNames += '\0';
 
-            int idx = static_cast<int>(std::distance(
-                options.begin(),
-                std::find_if(
-                    options.begin(),
-                    options.end(),
-                    [value](const OptionProperty::Option& o) { return o.value == value; }
-                )
-            ));
-
-            const bool hasChanged = ImGui::Combo(name.c_str(), &idx, nodeNames.c_str());
-            if (showTooltip) {
-                renderTooltip(prop, tooltipDelay);
-            }
-
-            if (hasChanged) {
-                value = options[idx].value;
-            }
-
-            break;
-        }
+    // The order of the options does not have to correspond with the value of the
+    // option
+    std::string nodeNames;
+    for (const OptionProperty::Option& o : options) {
+        nodeNames += o.description + '\0';
     }
+    nodeNames += '\0';
+
+    int idx = static_cast<int>(std::distance(
+        options.begin(),
+        std::find_if(
+            options.begin(),
+            options.end(),
+            [value](const OptionProperty::Option& o) { return o.value == value; }
+        )
+    ));
+
+    const bool hasChanged = ImGui::Combo(name.c_str(), &idx, nodeNames.c_str());
+    if (showTooltip) {
+        renderTooltip(prop, tooltipDelay);
+    }
+
+    if (hasChanged) {
+        value = options[idx].value;
+    }
+
     if (value != p->value() && !isReadOnly) {
         executeSetPropertyScript(p->uri(), std::to_string(value));
     }
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index 1541e8b46d..1fd577a312 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -191,7 +191,7 @@ RenderableKameleonVolume::RenderableKameleonVolume(const ghoul::Dictionary& dict
     , _domainScale(DomainScaleInfo, glm::vec3(1.f))
     , _lowerValueBound(LowerValueBoundInfo, 0.f, 0.f, 1.f)
     , _upperValueBound(UpperValueBoundInfo, 1.f, 0.01f, 1.f)
-    , _gridType(GridTypeInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _gridType(GridTypeInfo)
     , _stepSize(StepSizeInfo, 0.02f, 0.01f, 1.f)
     , _sourcePath(SourcePathInfo)
     , _transferFunctionPath(TransferFunctionInfo)
diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp
index 44f415c011..ac697cab3f 100644
--- a/modules/space/rendering/renderablefluxnodes.cpp
+++ b/modules/space/rendering/renderablefluxnodes.cpp
@@ -298,9 +298,9 @@ documentation::Documentation RenderableFluxNodes::Documentation() {
 RenderableFluxNodes::RenderableFluxNodes(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _earthdistGroup({ "Earthfocus" })
-    , _goesEnergyBins(GoesEnergyBinsInfo, properties::OptionProperty::DisplayType::Radio)
+    , _goesEnergyBins(GoesEnergyBinsInfo)
     , _styleGroup({ "Style" })
-    , _colorMode(ColorModeInfo, properties::OptionProperty::DisplayType::Radio)
+    , _colorMode(ColorModeInfo)
     , _streamColor(
         StreamColorInfo,
         glm::vec4(0.96f, 0.88f, 0.8f, 1.f),
@@ -311,7 +311,7 @@ RenderableFluxNodes::RenderableFluxNodes(const ghoul::Dictionary& dictionary)
     , _colorTableRange(colorTableRangeInfo, { -2.f, 4.f }, { -8.f, -8.f }, { 8.f, 8.f })
     , _fluxColorAlpha(FluxColorAlphaInfo, 1.f, 0.f, 1.f)
     , _streamGroup({ "Streams" })
-    , _scalingMethod(ScalingmethodInfo, properties::OptionProperty::DisplayType::Radio)
+    , _scalingMethod(ScalingmethodInfo)
     , _nodesAmountGroup({ "NodeGroup" })
     , _nodeSize(NodeSizeInfo, 2.f, 1.f, 10.f)
     , _distanceThreshold(DistanceThresholdInfo, 0.f, 0.f, 1.f)
@@ -323,7 +323,7 @@ RenderableFluxNodes::RenderableFluxNodes(const ghoul::Dictionary& dictionary)
     , _filteringLower(FilteringInfo, 0.f, 0.f, 5.f)
     , _filteringUpper(FilteringUpperInfo, 5.f, 0.f, 5.f)
     , _amountofNodes(AmountofNodesInfo, 1, 1, 100)
-    , _nodeskipMethod(NodeskipMethodInfo, properties::OptionProperty::DisplayType::Radio)
+    , _nodeskipMethod(NodeskipMethodInfo)
     , _defaultNodeSkip(DefaultNodeSkipInfo, 1, 1, 100)
     , _fluxNodeskipThreshold(FluxNodeskipThresholdInfo, 0, -20, 10)
     , _earthNodeSkip(EarthNodeSkipInfo, 1, 1, 100)
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index 0936428354..b239868332 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -258,10 +258,7 @@ RenderableOrbitalKepler::Appearance::Appearance()
     , pointSizeExponent(PointSizeExponentInfo, 1.0f, 0.f, 11.f)
     , enableMaxSize(EnableMaxSizeInfo, true)
     , maxSize(MaxSizeInfo, 5.f, 0.f, 45.f)
-    , renderingModes(
-        RenderingModeInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , renderingModes(RenderingModeInfo)
     , trailFade(TrailFadeInfo, 20.f, 0.f, 30.f)
     , enableOutline(EnableOutlineInfo, true)
     , outlineColor(OutlineColorInfo, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(1.f))
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index 87853fd355..060c7f8787 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -450,11 +450,8 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
         properties::StringProperty(MappingVzInfo),
         properties::StringProperty(MappingSpeedInfo)
     }
-    , _colorOption(ColorOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
-    , _otherDataOption(
-        OtherDataOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , _colorOption(ColorOptionInfo)
+    , _otherDataOption(OtherDataOptionInfo)
     , _otherDataColorMapPath(OtherDataColorMapInfo)
     , _otherDataRange(
         OtherDataValueRangeInfo,
@@ -484,10 +481,7 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     }
     , _parameters {
         properties::PropertyOwner(SizeCompositionInfo),
-        properties::OptionProperty(
-            SizeCompositionMethodInfo,
-            properties::OptionProperty::DisplayType::Dropdown
-        ),
+        properties::OptionProperty(SizeCompositionMethodInfo),
         properties::FloatProperty(LumPercentInfo, 0.5f, 0.f, 3.f),
         properties::FloatProperty(RadiusPercentInfo, 0.5f, 0.f, 3.f)
     }
@@ -614,7 +608,7 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     _useProperMotion = p.useProperMotion.value_or(_useProperMotion);
     addProperty(_useProperMotion);
 
-    
+
     _properMotionEpoch = p.properMotionEpoch.value_or(_properMotionEpoch);
     addProperty(_properMotionEpoch);
 
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
index 3d05eb20b7..c1922d5961 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
@@ -157,10 +157,7 @@ RenderableShadowCylinder::RenderableShadowCylinder(const ghoul::Dictionary& dict
     , _numberOfPoints(NumberPointsInfo, 190, 1, 300)
     , _shadowLength(ShadowLengthInfo, 0.1f, 0.f, 0.5f)
     , _shadowColor(ShadowColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
-    , _terminatorType(
-        TerminatorTypeInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , _terminatorType(TerminatorTypeInfo)
     , _lightSource(LightSourceInfo)
     , _observer(ObserverInfo)
     , _body(BodyInfo)
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index acd8f5944c..beb5eaa10b 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -171,7 +171,7 @@ documentation::Documentation RenderableTimeVaryingVolume::Documentation() {
 RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
                                                       const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _gridType(GridTypeInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _gridType(GridTypeInfo)
     , _stepSize(StepSizeInfo, 0.02f, 0.001f, 0.1f)
     , _brightness(BrightnessInfo, 0.33f, 0.f, 1.f)
     , _rNormalization(rNormalizationInfo, 0.f, 0.f, 2.f)
diff --git a/src/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp
index 7fba01b9f0..7928c452bd 100644
--- a/src/navigation/pathnavigator.cpp
+++ b/src/navigation/pathnavigator.cpp
@@ -128,10 +128,7 @@ namespace openspace::interaction {
 
 PathNavigator::PathNavigator()
     : properties::PropertyOwner({ "PathNavigator", "Path Navigator" })
-    , _defaultPathType(
-        DefaultCurveOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
+    , _defaultPathType(DefaultCurveOptionInfo)
     , _includeRoll(IncludeRollInfo, false)
     , _speedScale(SpeedScaleInfo, 1.f, 0.01f, 2.f)
     , _applyIdleBehaviorOnFinish(IdleBehaviorOnFinishInfo, false)
diff --git a/src/properties/misc/optionproperty.cpp b/src/properties/misc/optionproperty.cpp
index 87e05b7bb5..bc22709d89 100644
--- a/src/properties/misc/optionproperty.cpp
+++ b/src/properties/misc/optionproperty.cpp
@@ -1,5 +1,4 @@
 /*****************************************************************************************
-
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
@@ -32,6 +31,26 @@
 
 namespace {
     constexpr std::string_view _loggerCat = "OptionProperty";
+
+    using Option = openspace::properties::OptionProperty::Option;
+
+    bool addOptionInternal(int value, std::string desc, std::vector<Option>& options) {
+        Option option = { .value = value, .description = std::move(desc) };
+
+        for (const Option& o : options) {
+            if (o.value == option.value) {
+                LWARNING(std::format(
+                    "The value of option {{ {} -> {} }} was already registered when "
+                    "trying to add option {{ {} -> {} }}",
+                    o.value, o.description, option.value, option.description
+
+                ));
+                return false;
+            }
+        }
+        options.push_back(std::move(option));
+        return true;
+    }
 } // namespace
 
 namespace openspace::properties {
@@ -46,18 +65,6 @@ OptionProperty::OptionProperty(PropertyInfo info)
         std::numeric_limits<int>::max(),
         1
     )
-    , _displayType(DisplayType::Radio)
-{}
-
-OptionProperty::OptionProperty(PropertyInfo info, DisplayType displayType)
-    : NumericalProperty<int>(
-        std::move(info),
-        0,
-        std::numeric_limits<int>::lowest(),
-        std::numeric_limits<int>::max(),
-        1
-    )
-    , _displayType(displayType)
 {}
 
 std::string_view OptionProperty::className() const {
@@ -70,47 +77,40 @@ ghoul::lua::LuaTypes OptionProperty::typeLua() const {
     );
 }
 
-OptionProperty::DisplayType OptionProperty::displayType() const {
-    return _displayType;
-}
-
 const std::vector<OptionProperty::Option>& OptionProperty::options() const {
     return _options;
 }
 
-void OptionProperty::addOption(int value, std::string desc) {
-    Option option = { .value = value, .description = std::move(desc) };
-
-    for (const Option& o : _options) {
-        if (o.value == option.value) {
-            LWARNING(std::format(
-                "The value of option {{ {} -> {} }} was already registered when trying "
-                "to add option {{ {} -> {} }}",
-                o.value, o.description, option.value, option.description
-
-            ));
-            return;
-        }
+void OptionProperty::addOption(int value, std::string description) {
+    bool success = addOptionInternal(value, description, _options);
+    if (success) {
+        // Set default value to option added first
+        NumericalProperty::setValue(_options[0].value);
+        notifyChangeListeners();
     }
-    _options.push_back(std::move(option));
-    // Set default value to option added first
-    NumericalProperty::setValue(_options[0].value);
 }
 
 void OptionProperty::addOptions(std::vector<std::pair<int, std::string>> options) {
     for (std::pair<int, std::string>& p : options) {
-        addOption(p.first, std::move(p.second));
+        addOptionInternal(p.first, std::move(p.second), _options);
     }
+    // Set default value to option added first
+    NumericalProperty::setValue(_options[0].value);
+    notifyChangeListeners();
 }
 
 void OptionProperty::addOptions(std::vector<std::string> options) {
     for (int i = 0; i < static_cast<int>(options.size()); i++) {
-        addOption(i, std::move(options[i]));
+        addOptionInternal(i, std::move(options[i]), _options);
     }
+    // Set default value to option added first
+    NumericalProperty::setValue(_options[0].value);
+    notifyChangeListeners();
 }
 
 void OptionProperty::clearOptions() {
     _options.clear();
+    notifyChangeListeners();
     _value = 0;
 }
 
diff --git a/src/rendering/colormappingcomponent.cpp b/src/rendering/colormappingcomponent.cpp
index 0f39dd468b..e242280917 100644
--- a/src/rendering/colormappingcomponent.cpp
+++ b/src/rendering/colormappingcomponent.cpp
@@ -216,7 +216,7 @@ ColorMappingComponent::ColorMappingComponent()
     : properties::PropertyOwner({ "ColorMapping", "Color Mapping", "" })
     , enabled(EnabledInfo, true)
     , invert(InvertColorMapInfo, false)
-    , dataColumn(ParameterInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , dataColumn(ParameterInfo)
     , colorMapFile(FileInfo)
     , valueRange(RangeInfo, glm::vec2(0.f))
     , setRangeFromData(SetRangeFromDataInfo)