From b624248a13a9bedaee9a1279882d6a782e46839f Mon Sep 17 00:00:00 2001
From: Morgan Hardwood <bugs@londonlight.org>
Date: Mon, 1 Jan 2018 22:02:15 +0100
Subject: [PATCH] LCurve::colorForValue formatting

---
 rtgui/labcurve.cc | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/rtgui/labcurve.cc b/rtgui/labcurve.cc
index ae5774960..1cde4262d 100644
--- a/rtgui/labcurve.cc
+++ b/rtgui/labcurve.cc
@@ -571,43 +571,30 @@ void LCurve::colorForValue (double valX, double valY, enum ColorCaller::ElemType
     }
 
     if (callerId == 1) {         // ch - main curve
-
         Color::hsv2rgb01(float(valX), float(valY), 0.5f, R, G, B);
     } else if (callerId == 2) {  // cc - bottom bar
-
         float value = (1.f - 0.7f) * float(valX) + 0.7f;
         // whole hue range
         // Y axis / from 0.15 up to 0.75 (arbitrary values; was 0.45 before)
         Color::hsv2rgb01(float(valY*0.8), float(valX), value, R, G, B);
     } else if (callerId == 6) {  // cc - left bar
-
         float value = (1.f - 0.7f) * float(valX) + 0.7f;
-            float hue = (1.14056f - 0.92f) * float(valY) + 0.92f;
-
-            if (hue > 1.0f) {
-                hue -= 1.0f;
-            }
-
-            // Y axis / from 0.15 up to 0.75 (arbitrary values; was 0.45 before)
-            Color::hsv2rgb01(hue, float(valX), value, R, G, B);
-		
-        // whole hue range
+        float hue = (1.14056f - 0.92f) * float(valY) + 0.92f;
+        if (hue > 1.0f) {
+            hue -= 1.0f;
+        }
         // Y axis / from 0.15 up to 0.75 (arbitrary values; was 0.45 before)
-      //  Color::hsv2rgb01(float(valY), float(valX), value, R, G, B);
+        Color::hsv2rgb01(hue, float(valX), value, R, G, B);
     } else if (callerId == 3) {  // lc - bottom bar
-
         float value = (1.f - 0.7f) * float(valX) + 0.7f;
-
         if (lcredsk->get_active()) {
             // skin range
             // -0.1 rad < Hue < 1.6 rad
             // Y axis / from 0.92 up to 0.14056
             float hue = (1.14056f - 0.92f) * float(valY) + 0.92f;
-
             if (hue > 1.0f) {
                 hue -= 1.0f;
             }
-
             // Y axis / from 0.15 up to 0.75 (arbitrary values; was 0.45 before)
             Color::hsv2rgb01(hue, float(valX), value, R, G, B);
         } else {
@@ -619,16 +606,13 @@ void LCurve::colorForValue (double valX, double valY, enum ColorCaller::ElemType
         Color::hsv2rgb01(float(valX), 0.5f, float(valY), R, G, B);
     } else if (callerId == 5) {  // HH - bottom bar
         float h = float((valY - 0.5) * 0.3 + valX);
-
         if (h > 1.0f) {
             h -= 1.0f;
         } else if (h < 0.0f) {
             h += 1.0f;
         }
-
         Color::hsv2rgb01(h, 0.5f, 0.5f, R, G, B);
     } else if (callerId == 7) {  // cc and cl - left bar
-
         float value = (1.f - 0.7f) * float(valX) + 0.7f;
         // whole hue range
         // Y axis / from 0.15 up to 0.75 (arbitrary values; was 0.45 before)