From fd512fa9414718b05527d614d2d85456ff8a72c7 Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Sat, 31 Jan 2026 21:39:53 +0100
Subject: [PATCH] jfjoch_viewer: Single green color map

---
 broker/OpenAPIConvert.cpp                     |  2 +-
 common/ColorScale.cpp                         | 25 +++----------------
 common/ColorScale.h                           |  4 +--
 viewer/toolbar/JFJochViewerToolbarDisplay.cpp |  4 +--
 4 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/broker/OpenAPIConvert.cpp b/broker/OpenAPIConvert.cpp
index a769b669..13576b9d 100644
--- a/broker/OpenAPIConvert.cpp
+++ b/broker/OpenAPIConvert.cpp
@@ -882,7 +882,7 @@ ColorScaleEnum ConvertColorScale(const std::optional<std::string> &input) {
     if (color == "wb")
         return ColorScaleEnum::WB;
     if (color == "green")
-        return ColorScaleEnum::Green3;
+        return ColorScaleEnum::Green;
     if (color == "heat")
         return ColorScaleEnum::Heat;
     if (color == "indigo")
diff --git a/common/ColorScale.cpp b/common/ColorScale.cpp
index 117388b3..65a88fd0 100644
--- a/common/ColorScale.cpp
+++ b/common/ColorScale.cpp
@@ -54,11 +54,7 @@ void ColorScale::CalcLUT() const {
             break;
         case ColorScaleEnum::WB: map = &black_to_white_colormap;
             break;
-        case ColorScaleEnum::Green1:
-        case ColorScaleEnum::Green2:
-            map = nullptr;
-            break; // handled below
-        case ColorScaleEnum::Green3:
+        case ColorScaleEnum::Green:
             map = &green_colormap;
             break;
         case ColorScaleEnum::Magma:
@@ -70,23 +66,10 @@ void ColorScale::CalcLUT() const {
                                   "Color scale unknown");
     }
 
-    if (current == ColorScaleEnum::Green1) {
-        for (size_t i = 0; i < kLutSize; ++i) {
-            const float f = static_cast<float>(i) / static_cast<float>(kLutSize - 1);
-            lut_[i] = GreenGamma(f, 0.7f);
-        }
-    } else if (current == ColorScaleEnum::Green2) {
-        for (size_t i = 0; i < kLutSize; ++i) {
-            const float f = static_cast<float>(i) / static_cast<float>(kLutSize - 1);
-            lut_[i] = GreenAsinh(f, 8.0f);
-        }
-    } else {
-        for (size_t i = 0; i < kLutSize; ++i) {
-            const float f = static_cast<float>(i) / static_cast<float>(kLutSize - 1);
-            lut_[i] = Apply(f, *map);
-        }
+    for (size_t i = 0; i < kLutSize; ++i) {
+        const float f = static_cast<float>(i) / static_cast<float>(kLutSize - 1);
+        lut_[i] = Apply(f, *map);
     }
-
 }
 
 rgb ColorScale::Apply(float input, const std::vector<rgb> &map) {
diff --git a/common/ColorScale.h b/common/ColorScale.h
index e0395937..3fab2ff4 100644
--- a/common/ColorScale.h
+++ b/common/ColorScale.h
@@ -25,9 +25,7 @@ enum class ColorScaleEnum : int {
     Heat = 4,
     BW = 5,
     WB = 6,
-    Green1 = 7,
-    Green2 = 8,
-    Green3 = 9
+    Green = 7
 };
 
 enum class ColorScaleSpecial {
diff --git a/viewer/toolbar/JFJochViewerToolbarDisplay.cpp b/viewer/toolbar/JFJochViewerToolbarDisplay.cpp
index 7d60f8be..1b27fc4b 100644
--- a/viewer/toolbar/JFJochViewerToolbarDisplay.cpp
+++ b/viewer/toolbar/JFJochViewerToolbarDisplay.cpp
@@ -29,9 +29,7 @@ JFJochViewerToolbarDisplay::JFJochViewerToolbarDisplay(QWidget *parent)
     color_map_select->addItem("Heat", static_cast<int>(ColorScaleEnum::Heat));
     color_map_select->addItem("Black on white", static_cast<int>(ColorScaleEnum::BW));
     color_map_select->addItem("White on black", static_cast<int>(ColorScaleEnum::WB));
-    color_map_select->addItem("Green (gamma)", static_cast<int>(ColorScaleEnum::Green1));
-    color_map_select->addItem("Green (asinh)", static_cast<int>(ColorScaleEnum::Green2));
-    color_map_select->addItem("Green (linear)", static_cast<int>(ColorScaleEnum::Green3));
+    color_map_select->addItem("Green", static_cast<int>(ColorScaleEnum::Green));
 
     color_map_select->setCurrentIndex(static_cast<int>(ColorScaleEnum::Indigo));
     addWidget(color_map_select);