Newlocallab2 : Local adjustments - Improve GUI and fixed some bugs

rtdata/themes/RawTherapee-GTK3-20_.css

@@ -745,6 +745,7 @@ flowboxchild:selected {
     background-color: #363636;
 }
 
+#LocallabToolPanel frame,
 #ExpanderBox  frame,
 #ExpanderBox2 frame,
 #ExpanderBox3 frame {
@@ -761,18 +762,22 @@ flowboxchild:selected {
     padding: 0.25em;
 }
 
+#LocallabToolPanel frame > label, #LocallabToolPanel frame frame > label,
 #ExpanderBox  frame > label, #ExpanderBox  frame frame > label,
 #ExpanderBox2 frame > label, #ExpanderBox2 frame frame > label,
 #ExpanderBox3 frame > label, #ExpanderBox3 frame frame > label {
     margin-left: 7pt;
     margin-top: 0;
 }
+
+#LocallabToolPanel  frame > box, #LocallabToolPanel  frame frame > box, #LocallabToolPanel  frame > grid, #LocallabToolPanel  frame frame > grid,
 #ExpanderBox  frame > box, #ExpanderBox  frame frame > box, #ExpanderBox  frame > grid, #ExpanderBox  frame frame > grid,
 #ExpanderBox2 frame > box, #ExpanderBox2 frame frame > box, #ExpanderBox2 frame > grid, #ExpanderBox2 frame frame > grid,
 #ExpanderBox3 frame > box, #ExpanderBox3 frame frame > box, #ExpanderBox3 frame > grid, #ExpanderBox3 frame frame > grid {
     margin: 0.1666666666666666em;
 }
 
+#LocallabToolPanel  > box > checkbutton, #LocallabToolPanel  > box > box, #LocallabToolPanel  > grid > checkbutton, #LocallabToolPanel  > box > grid, #LocallabToolPanel  > grid > grid, #LocallabToolPanel  frame > box > grid, #LocallabToolPanel  frame > grid > grid, #LocallabToolPanel  frame > grid > box,
 #ExpanderBox  > box > checkbutton, #ExpanderBox  > box > box, #ExpanderBox  > grid > checkbutton, #ExpanderBox  > box > grid, #ExpanderBox  > grid > grid, #ExpanderBox  frame > box > grid, #ExpanderBox  frame > grid > grid, #ExpanderBox  frame > grid > box,
 #ExpanderBox2 > box > checkbutton, #ExpanderBox2 > box > box, #ExpanderBox2 > grid > checkbutton, #ExpanderBox2 > box > grid, #ExpanderBox2 > grid > grid, #ExpanderBox2 frame > box > grid, #ExpanderBox2 frame > grid > grid, #ExpanderBox2 frame > grid > box,
 #ExpanderBox3 > box > checkbutton, #ExpanderBox3 > box > box, #ExpanderBox3 > grid > checkbutton, #ExpanderBox3 > box > grid, #ExpanderBox3 > grid > grid, #ExpanderBox3 frame > box > grid, #ExpanderBox3 frame > grid > grid, #ExpanderBox3 frame > grid > box {
@@ -796,6 +801,7 @@ flowboxchild:selected {
 }
 
 /* Sub-tool (MyExpander) background */
+#LocallabToolPanel > box, #LocallabToolPanel > grid,
 #ExpanderBox2 > box, #ExpanderBox2 > grid {
     background-color: #3B3B3B;
     border: 0.0833333333333333em solid #2A2A2A;
@@ -804,10 +810,12 @@ flowboxchild:selected {
     padding: 0.25em;
 }
 
+#LocallabToolPanel drawingarea,
 #ExpanderBox2 drawingarea {
     background-color: #3B3B3B;
 }
 
+#LocallabToolPanel frame > border,
 #ExpanderBox2 frame > border {
     background-color: #414141;
     border: 0.0833333333333333em solid #373737;
@@ -816,10 +824,12 @@ flowboxchild:selected {
     padding: 0.25em;
 }
 
+#LocallabToolPanel frame drawingarea,
 #ExpanderBox2 frame drawingarea {
     background-color: #414141;
 }
 
+#LocallabToolPanel frame frame > border,
 #ExpanderBox2 frame frame > border {
     background-color: #474747;
     border: 0.0833333333333333em solid #3D3D3D;
@@ -828,6 +838,7 @@ flowboxchild:selected {
     padding: 0.25em;
 }
 
+#LocallabToolPanel frame frame drawingarea,
 #ExpanderBox2 frame frame drawingarea {
     background-color: #474747;
 }
@@ -854,7 +865,7 @@ flowboxchild:selected {
     color: #D8D8D8;
 }
 
-#ExpanderBox2 separator, #ExpanderBox3 separator {
+#LocallabToolPanel separator, #ExpanderBox2 separator, #ExpanderBox3 separator {
     color: #292929;
 }
 

rtengine/CMakeLists.txt

@@ -117,7 +117,9 @@ set(RTENGINESOURCEFILES
     impulse_denoise.cc
     init.cc
     ipdehaze.cc
+    ipgrain.cc
     iplab2rgb.cc
+    iplocallab.cc
     iplabregions.cc
     iplocalcontrast.cc
     ipresize.cc

rtengine/EdgePreservingDecomposition.cc

@@ -916,7 +916,7 @@ void EdgePreservingDecomposition::CompressDynamicRange(float *Source, float Scal
     float temp;
 
     if(DetailBoost > 0.f) {
-        float betemp = expf(-(2.f - DetailBoost + 0.694f)) - 1.f; //0.694 = log(2)
+        float betemp = expf(-(2.f - DetailBoost + 0.693147f)) - 1.f; //0.694 = log(2)
         temp = 1.2f * xlogf( -betemp);
     } else {
         temp = CompressionExponent - 1.0f;

rtengine/color.cc

@@ -45,6 +45,9 @@ LUTf Color::igammatab_srgb;
 LUTf Color::igammatab_srgb1;
 LUTf Color::gammatab_srgb;
 LUTf Color::gammatab_srgb1;
+LUTf Color::gammatab_srgb327;
+LUTf Color::gammatab_bt709;
+LUTf Color::igammatab_bt709;
 
 LUTf Color::denoiseGammaTab;
 LUTf Color::denoiseIGammaTab;
@@ -130,9 +133,12 @@ void Color::init ()
     gammatabThumb(maxindex, 0);
 
     igammatab_srgb(maxindex, 0);
+    igammatab_bt709(maxindex, 0);
     igammatab_srgb1(maxindex, 0);
     gammatab_srgb(maxindex, 0);
+    gammatab_bt709(maxindex, 0);
     gammatab_srgb1(maxindex, 0);
+    gammatab_srgb327(32768, 0);
 
     denoiseGammaTab(maxindex, 0);
     denoiseIGammaTab(maxindex, 0);
@@ -197,6 +203,18 @@ void Color::init ()
         }
 #ifdef _OPENMP
         #pragma omp section
+#endif
+        {
+            for (int i = 0; i < 32768; i++)
+            {
+                gammatab_srgb327[i] = gamma2(i / 32767.0);
+            }
+
+            gammatab_srgb327 *= 32767.f;
+            //  gamma2curve.share(gammatab_srgb, LUT_CLIP_BELOW | LUT_CLIP_ABOVE); // shares the buffer with gammatab_srgb but has different clip flags
+        }
+#ifdef _OPENMP
+        #pragma omp section
 #endif
         {
             for (int i = 0; i < maxindex; i++)
@@ -206,6 +224,7 @@ void Color::init ()
 
             igammatab_srgb *= 65535.f;
         }
+
 #ifdef _OPENMP
         #pragma omp section
 #endif
@@ -282,6 +301,22 @@ void Color::init ()
                 break;
         }
 
+#ifdef _OPENMP
+        #pragma omp section
+#endif
+
+        for (int i = 0; i < maxindex; i++) {
+            gammatab_bt709[i] = 65535.0 * gamma709(i / 65535.0);
+        }
+
+#ifdef _OPENMP
+        #pragma omp section
+#endif
+
+        for (int i = 0; i < maxindex; i++) {
+            igammatab_bt709[i] = 65535.0 * igamma709(i / 65535.0);
+        }
+
 #ifdef _OPENMP
         #pragma omp section
 #endif

rtengine/color.h

@@ -162,12 +162,15 @@ class Color
     static LUTf igammatab_srgb;
     static LUTf igammatab_srgb1;
     static LUTf gammatab_srgb;
+    static LUTf gammatab_srgb327;
     static LUTf gammatab_srgb1;
+    static LUTf gammatab_bt709;
 
     static LUTf denoiseGammaTab;
     static LUTf denoiseIGammaTab;
 
     static LUTf igammatab_24_17;
+    static LUTf igammatab_bt709;
     static LUTf gammatab_24_17a;
     static LUTf gammatab_13_2;
     static LUTf igammatab_13_2;
@@ -1150,23 +1153,25 @@ class Color
     }
 
 
-    /*
+/*
     * @brief Get the gamma value for Gamma=2.2 Slope=4.5
     * @param x red, green or blue channel's value [0 ; 1]
     * @return the gamma modified's value [0 ; 1]
     *
+*/
     static inline double gamma709     (double x) {
                                             return x <= 0.0176 ? x*4.5 : 1.0954*exp(log(x)/2.2)-0.0954;
                                     }
-
+/*
     * @brief Get the inverse gamma value for Gamma=2.2 Slope=4.5
     * @param x red, green or blue channel's value [0 ; 1]
     * @return the inverse gamma modified's value [0 ; 1]
     *
+*/
     static inline double igamma709    (double x) {
                                         return x <= 0.0795 ? x/4.5 : exp(log((x+0.0954)/1.0954)*2.2);
                                     }
-    */
+
 
 
 
@@ -1494,6 +1499,57 @@ class Color
     static void skinredfloat ( float J, float h, float sres, float Sp, float dred, float protect_red, int sk, float rstprotection, float ko, float &s);
 //  static void scaleredcdbl ( float skinprot, float param, float limit, float HH, float deltaHH, float &scale,float &scaleext);
 
+    static inline void pregamutlab(float lum, float hue, float &chr) //big approximation to limit gamut (Prophoto) before good gamut procedure for locallab chroma, to avoid crash
+    {
+        if (lum >= 95.0f) {
+            if (hue > 1.5f && hue < 2.f) {
+                chr = 120.f;
+            } else if (hue > 0.7f && hue <= 1.5f) {
+                chr = 60.f;
+            } else {
+                chr = 40.f;
+            }
+        }   else if (lum > 75.f) {
+            if (hue > 1.f && hue < 3.14f) {
+                chr = 130.f;
+            } else if (hue > -0.4f && hue <= 1.f) {
+                chr = 80.f;
+            } else if (hue > -3.15f && hue < -2.f) {
+                chr = 80.f;
+            } else {
+                chr = 60.f;
+            }
+
+        } else if (lum > 35.f) {
+            chr = 100.f;
+        }   else if (lum > 20.f) {
+            if (hue < -1.f && hue > -2.f) {
+                chr = 120.f;
+            } else {
+                chr = 80.f;
+            }
+        }   else if (lum > 7.f) {
+            if (hue < -1.f && hue > -1.8f) {
+                chr = 120.f;
+            } else {
+                chr = 60.f;
+            }
+
+        }   else {
+            if (hue < -1.f && hue > -1.6f) {
+                chr = 80.f;
+            } else {
+                chr = 40.f;
+            }
+
+        }
+
+        //      if(lum < 4.f) {
+        //          chr = 0.1f;
+        //      }
+    }
+
+
     static inline void SkinSatCbdl (float lum, float hue, float chrom, float skinprot, float &scale, bool neg, float b_l, float t_l, float t_r)
     {
 

rtengine/cplx_wavelet_dec.h

@@ -135,6 +135,14 @@ wavelet_decomposition::wavelet_decomposition(E * src, int width, int height, int
                 //n=0 lopass, n=1 hipass
             }
         }
+/*    } else if(wavfilt_len == 22) {
+        for (int n = 0; n < 2; n++) {
+            for (int i = 0; i < wavfilt_len; i++) {
+                wavfilt_anal[wavfilt_len * (n) + i]  = Daub4_anal22[n][i];
+                wavfilt_synth[wavfilt_len * (n) + i] = Daub4_anal22[n][wavfilt_len - 1 - i];
+                //n=0 lopass, n=1 hipass
+            }
+        } */
     } else if(wavfilt_len == 4) {
         for (int n = 0; n < 2; n++) {
             for (int i = 0; i < wavfilt_len; i++) {
@@ -144,7 +152,7 @@ wavelet_decomposition::wavelet_decomposition(E * src, int width, int height, int
             }
         }
     }
-
+//printf("OK cplx\n");
     // after coefficient rotation, data structure is:
     // wavelet_decomp[scale][channel={lo,hi1,hi2,hi3}][pixel_array]
 

rtengine/cplx_wavelet_filter_coeffs.h

@@ -48,11 +48,14 @@ const float Daub4_anal16[2][16] ALIGNED16 = {//Daub 14
     {0.f, 0.f, 0.055049715f, 0.28039564f, 0.515574245f, 0.33218624f, -0.10175691f, -0.158417505f, 0.05042335f, 0.057001725f, -0.026891225f, -0.01171997f, 0.008874895f, 0.0003037575f, -0.0012739524f, 0.0002501134f},
     { -0.0002501134f,  -0.0012739524f, -0.0003037575f, 0.008874895f, 0.01171997f , -0.026891225f, -0.057001725f, 0.05042335f, 0.158417505f, -0.10175691f, -0.33218624f, 0.515574245f, -0.28039564f, 0.055049715f, 0.f, 0.f}
 };
-/*
-const double Daub4_anal22[2][22] ALIGNED16 = {//Daub 20
-    {0., 0., 0.01885858, 0.13306109, 0.37278754, 0.48681406, 0.19881887, -0.1766681, -0.13855494, 0.09006372, 0.0658015, -0.05048328, -0.02082962, 0.0234849, 0.0025502185, -0.0075895, 0.0009866625, 0.0014088433, -0.00048497392, -0.0000823545, 0.00006617718, -0.000009379205},
-    {0.000009379205, -0.00006617718, 0.0000823545, 0.00048497392, -0.0014088433, -0.0009866627, 0.0075895, -0.0025502185, -0.0234849, 0.02082962, 0.05048328, -0.0658015, -0.09006372, 0.13855494, 0.1766681, -0.19881887, -0.48681406, -0.37278754, -0.13306109, -0.01885858, 0., 0.}
+
+const float Daub4_anal22[2][22] ALIGNED16 = {//Daub 20
+    {0.f, 0.f, 0.01885858f, 0.13306109f, 0.37278535f, 0.48681406f, 0.19881887f, -0.1766681f, -0.13855494f, 0.09006372f, 0.0658015f, -0.05048328f, -0.02082962f,
+    0.0234849f, 0.002550218f, -0.0075895f,  0.0009866627f, 0.001408843f, -0.000484973f, -0.0000823545f, 0.0000661271f, -0.00000939f},
+    {0.00000939f, -0.0000661271f, 0.0000823545f, 0.000484973f, -0.001408843f,  -0.0009866627f, 0.0075895f, -0.002550218f, -0.0234849f,
+    0.02082962f, 0.05048328f, -0.0658015f, -0.09006372f, 0.13855494f, 0.1766681f, -0.19881887f, -0.48681406f, -0.37278535f, -0.13306109f, -0.01885858f, 0.f, 0.f}
 };
-*/
+
+// if necessary ?? we can add D20 !! 
 }