From c3ae39da62db15e7b44b4687dcdf785d3e8dfce7 Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Fri, 1 Sep 2023 08:10:10 -0400
Subject: [PATCH] Change name of line fade in RenderableTrail from Fade to
 LineFade (#2857)

* Change name of line fade in RenderableTrail from Fade to LineFade

* Adress review comments

---------

Co-authored-by: Emma Broman <emma.broman@liu.se>
---
 modules/base/rendering/renderabletrail.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index f6a25cdf22..31477e4be6 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -86,8 +86,8 @@ namespace {
         openspace::properties::Property::Visibility::NoviceUser
     };
 
-    constexpr openspace::properties::Property::PropertyInfo FadeInfo = {
-        "Fade",
+    constexpr openspace::properties::Property::PropertyInfo LineFadeInfo = {
+        "LineFade",
         "Line fade",
         "The fading factor that is applied to the trail if the 'EnableFade' value is "
         "'true'. If it is 'false', this setting has no effect. The higher the number, "
@@ -138,8 +138,8 @@ namespace {
         // [[codegen::verbatim(EnableFadeInfo.description)]]
         std::optional<bool> enableFade;
 
-        // [[codegen::verbatim(FadeInfo.description)]]
-        std::optional<float> fade;
+        // [[codegen::verbatim(LineFadeInfo.description)]]
+        std::optional<float> lineFade;
 
         // [[codegen::verbatim(LineWidthInfo.description)]]
         std::optional<float> lineWidth;
@@ -173,7 +173,7 @@ RenderableTrail::Appearance::Appearance()
     })
     , lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , useLineFade(EnableFadeInfo, true)
-    , lineFade(FadeInfo, 1.f, 0.f, 30.f)
+    , lineFade(LineFadeInfo, 1.f, 0.f, 30.f)
     , lineWidth(LineWidthInfo, 10.f, 1.f, 20.f)
     , pointSize(PointSizeInfo, 1, 1, 64)
     , renderingModes(
@@ -211,7 +211,7 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
 
     _appearance.lineColor = p.color;
     _appearance.useLineFade = p.enableFade.value_or(_appearance.useLineFade);
-    _appearance.lineFade = p.fade.value_or(_appearance.lineFade);
+    _appearance.lineFade = p.lineFade.value_or(_appearance.lineFade);
     _appearance.lineWidth = p.lineWidth.value_or(_appearance.lineWidth);
     _appearance.pointSize = p.pointSize.value_or(_appearance.pointSize);