From 23abfa5ee355108539e98f7d4c1e8733152c3333 Mon Sep 17 00:00:00 2001
From: Malin Ejdbo <malin.ejdbo@gmail.com>
Date: Mon, 31 May 2021 16:19:25 +0200
Subject: [PATCH] Adjust labels

---
 .../planets/earth/lagrange_points/L1.asset    |  9 ++++-----
 .../planets/earth/lagrange_points/L2.asset    | 20 +++++++++----------
 .../planets/earth/lagrange_points/L4.asset    |  9 ++++-----
 .../planets/earth/lagrange_points/L5.asset    |  9 ++++-----
 modules/base/rendering/renderableprism.cpp    |  4 ++--
 5 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset
index c1364dff39..420ff19185 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset
@@ -37,12 +37,11 @@ local L1Label = {
   Renderable = {
     Enabled = false,
     Type = "RenderableLabels",
-    LabelText = "L1",
+    Text = "L1",
     FontSize = 20,
-    LabelSize = 7.5,
-    LabelMaxSize = 100.0,
-    LabelMinSize = 1.0,
-    LabelOrientationOption = "Camera View Direction",
+    Size = 7.5,
+    MinMaxSize = { 1.0, 100.0},
+    OrientationOption = "Camera View Direction",
     BlendMode = "Normal",
     EnableFading = false
   },
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset
index da5e3fef49..0f84519837 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset
@@ -63,12 +63,11 @@ local L2SmallLabel = {
   Renderable = {
     Enabled = true,
     Type = "RenderableLabels",
-    LabelText = "L2",
-    FontSize = 14.0,
-    LabelSize = 6.4,
-    LabelMaxSize = 100.0,
-    LabelMinSize = 1.0,
-    LabelOrientationOption = "Camera View Direction",
+    Text = "L2",
+    FontSize = 20.0,
+    Size = 6.0,
+    MinMaxSize = { 1.0, 100.0 },
+    OrientationOption = "Camera View Direction",
     BlendMode = "Normal",
     EnableFading = false
   },
@@ -86,12 +85,11 @@ local L2Label = {
   Renderable = {
     Enabled = false,
     Type = "RenderableLabels",
-    LabelText = "L2",
+    Text = "L2",
     FontSize = 20,
-    LabelSize = 7.5,
-    LabelMaxSize = 100.0,
-    LabelMinSize = 1.0,
-    LabelOrientationOption = "Camera View Direction",
+    Size = 7.5,
+    MinMaxSize = { 1.0, 100.0},
+    OrientationOption = "Camera View Direction",
     BlendMode = "Normal",
     EnableFading = false
   },
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset
index 6bcaaa9d4e..05ca2a57b5 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset
@@ -37,12 +37,11 @@ local L4Label = {
   Renderable = {
     Enabled = false,
     Type = "RenderableLabels",
-    LabelText = "L4",
+    Text = "L4",
     FontSize = 20,
-    LabelSize = 8.5,
-    LabelMaxSize = 100.0,
-    LabelMinSize = 1.0,
-    LabelOrientationOption = "Camera View Direction",
+    Size = 8.5,
+    MinMaxSize = { 1.0, 100.0 },
+    OrientationOption = "Camera View Direction",
     BlendMode = "Normal",
     EnableFading = false
   },
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset
index 3a17412737..dcaabb12b7 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset
@@ -37,12 +37,11 @@ local L5Label = {
   Renderable = {
     Enabled = false,
     Type = "RenderableLabels",
-    LabelText = "L5",
+    Text = "L5",
     FontSize = 20,
-    LabelSize = 8.5,
-    LabelMaxSize = 100.0,
-    LabelMinSize = 1.0,
-    LabelOrientationOption = "Camera View Direction",
+    Size = 8.5,
+    MinMaxSize = { 1.0, 100.0 },
+    OrientationOption = "Camera View Direction",
     BlendMode = "Normal",
     EnableFading = false
   },
diff --git a/modules/base/rendering/renderableprism.cpp b/modules/base/rendering/renderableprism.cpp
index 8f7633f222..b080050d30 100644
--- a/modules/base/rendering/renderableprism.cpp
+++ b/modules/base/rendering/renderableprism.cpp
@@ -140,7 +140,7 @@ RenderablePrism::RenderablePrism(const ghoul::Dictionary& dictionary)
     _nLines = p.lines.value_or(_nShapeSegments);
     addProperty(_nLines);
 
-    _radius.setViewOption(properties::Property::ViewOptions::Logarithmic);
+    _radius.setExponent(10.f);
     _radius.onChange([&]() { _prismIsDirty = true; });
     _radius = p.radius.value_or(_radius);
     addProperty(_radius);
@@ -152,7 +152,7 @@ RenderablePrism::RenderablePrism(const ghoul::Dictionary& dictionary)
     _lineColor = p.color.value_or(_lineColor);
     addProperty(_lineColor);
 
-    _length.setViewOption(properties::Property::ViewOptions::Logarithmic);
+    _length.setExponent(12.f);
     _length.onChange([&]() { _prismIsDirty = true; });
     _length = p.length.value_or(_length);
     addProperty(_length);