From 999a4f3257fc11f12299a8b81012adf03ae4719b Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Mon, 20 Jul 2020 08:40:06 +0200
Subject: [PATCH 01/10] Added in option edghi edglo limrad

---
 rtengine/ipwavelet.cc | 19 +++++++++++--------
 rtengine/settings.h   |  4 ++++
 rtgui/options.cc      | 27 +++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc
index 499ee7812..651884e34 100644
--- a/rtengine/ipwavelet.cc
+++ b/rtengine/ipwavelet.cc
@@ -3093,10 +3093,13 @@ void ImProcFunctions::ContAllL(float *koeLi[12], float maxkoeLi, bool lipschitz,
             float atten01234 = 0.80f;
             value *= (atten01234 * scaleskip[1]);    //for zoom < 100% reduce strength...I choose level 1...but!!
         }
-
+        float edghig = settings->edghi;//increase or reduce "reinforce"
+        float edglow = settings->edglo;//increase or reduce "reduce"
+        float limrad = settings->limrad;//threshold action in function radius (rad)
+        printf("edghi=%f edglo=%f limrad=%f\n", edghig, edglow, limrad); 
         // value *= beta;
         float edge = 1.f;
-        float lim0 = 20.f; //arbitrary limit for low radius and level between 2 or 3 to 30 maxi
+        float lim0 = limrad; //arbitrary limit for low radius and level between 2 or 3 to 30 maxi
         float lev = float (level);
         float repart = (float)cp.til;
 
@@ -3104,15 +3107,14 @@ void ImProcFunctions::ContAllL(float *koeLi[12], float maxkoeLi, bool lipschitz,
         if (cp.reinforce != 2) {
             const float brepart =
                 cp.reinforce == 1
-                ? 3.f
-                : 0.5f;
+                ? edghig
+                : edglow;
             const float arepart = -(brepart - 1.f) / (lim0 / 60.f);
 
-            if (rad < lim0 / 60.f) {
+            if (rad < (lim0 / 60.f)) {
                 repart *= (arepart * rad + brepart);    //linear repartition of repart
             }
         }
-
         float al0 = 1.f + (repart) / 50.f;
         float al10 = 1.0f; //arbitrary value ==> less = take into account high levels
         //  float ak =-(al0-al10)/10.f;//10 = maximum levels
@@ -3120,15 +3122,16 @@ void ImProcFunctions::ContAllL(float *koeLi[12], float maxkoeLi, bool lipschitz,
         float bk = al0;
         float koef = ak * level + bk; //modulate for levels : more levels high, more koef low ==> concentrated action on low levels, without or near for high levels
         float expkoef = -std::pow(std::fabs(rad - lev), koef); //reduce effect for high levels
+        printf("repart=%f\n", repart);
 
         if (cp.reinforce == 3) {
-            if (rad < lim0 / 60.f && level == 0) {
+            if (rad < (lim0 / 60.f) && level == 0) {
                 expkoef *= abs(repart);    //reduce effect for low values of rad and level=0==> quasi only level 1 is effective
             }
         }
 
         if (cp.reinforce == 1) {
-            if (rad < lim0 / 60.f && level == 1) {
+            if (rad < (lim0 / 60.f) && level == 1) {
                 expkoef /= repart;    //increase effect for low values of rad and level=1==> quasi only level 0 is effective
             }
         }
diff --git a/rtengine/settings.h b/rtengine/settings.h
index fde6fa132..0fb4996df 100644
--- a/rtengine/settings.h
+++ b/rtengine/settings.h
@@ -99,6 +99,10 @@ public:
     int             itcwb_delta;
     bool            itcwb_stdobserver10;
     int             itcwb_precis;
+//wavelet levels
+    double          edghi;
+    double          edglo;
+    double          limrad;
 
 
     enum class ThumbnailInspectorMode {
diff --git a/rtgui/options.cc b/rtgui/options.cc
index cc49f1fcd..04914e748 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -617,6 +617,12 @@ void Options::setDefaults()
     rtSettings.itcwb_precis = 5;//3  or 5 or 9
 // end locallab
 
+//wavelet
+    rtSettings.edghi = 3.0;//1.1 and 5.
+    rtSettings.edglo = 0.5;//0.1 and 0.95
+    rtSettings.limrad = 20.;//1 and 60
+    
+
     rtSettings.protectred = 60;
     rtSettings.protectredh = 0.3;
     rtSettings.CRI_color = 0;
@@ -1704,6 +1710,22 @@ void Options::readFromFile(Glib::ustring fname)
 
             }
 
+            if (keyFile.has_group("Wavelet")) {
+                if (keyFile.has_key("Wavelet", "Edghi")) {
+                    rtSettings.edghi = keyFile.get_double("Wavelet", "Edghi");
+                }
+
+                if (keyFile.has_key("Wavelet", "Edglo")) {
+                    rtSettings.edglo = keyFile.get_double("Wavelet", "Edglo");
+                }
+
+                if (keyFile.has_key("Wavelet", "Limrad")) {
+                    rtSettings.limrad = keyFile.get_double("Wavelet", "Limrad");
+                }
+
+            }
+            
+            
             if (keyFile.has_group("ICC Profile Creator")) {
                 if (keyFile.has_key("ICC Profile Creator", "PimariesPreset")) {
                     ICCPC_primariesPreset = keyFile.get_string("ICC Profile Creator", "PimariesPreset");
@@ -2302,6 +2324,11 @@ void Options::saveToFile(Glib::ustring fname)
         keyFile.set_integer("Color Management", "Previewselection", rtSettings.previewselection);
         keyFile.set_double("Color Management", "Cbdlsensi", rtSettings.cbdlsensi);
 
+        keyFile.set_double("Wavelet", "Edghi", rtSettings.edghi);
+        keyFile.set_double("Wavelet", "Edglo", rtSettings.edglo);
+        keyFile.set_double("Wavelet", "Limrad", rtSettings.limrad);
+
+
         keyFile.set_string("ICC Profile Creator", "PimariesPreset", ICCPC_primariesPreset);
         keyFile.set_double("ICC Profile Creator", "RedPrimaryX", ICCPC_redPrimaryX);
         keyFile.set_double("ICC Profile Creator", "RedPrimaryY", ICCPC_redPrimaryY);

From 932e0beea957672775d07e2cefc6ddecf88c53f4 Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Sun, 26 Jul 2020 07:17:39 +0200
Subject: [PATCH 02/10] Hide choice edgesharpness slider curve

---
 rtengine/ipwavelet.cc | 6 +++---
 rtgui/wavelet.cc      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc
index 651884e34..b2ae5fc1d 100644
--- a/rtengine/ipwavelet.cc
+++ b/rtengine/ipwavelet.cc
@@ -323,14 +323,14 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
     }
 
     cp.CHSLmet = 1;
-    cp.EDmet = 1;
-
+    cp.EDmet = 2;
+/*
     if (params->wavelet.EDmethod == "SL") {
         cp.EDmet = 1;
     } else if (params->wavelet.EDmethod == "CU") {
         cp.EDmet = 2;
     }
-
+*/
     cp.cbena = params->wavelet.cbenab;
     cp.blhigh = (float)params->wavelet.bluehigh;
     cp.grhigh = (float)params->wavelet.greenhigh;
diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc
index ac8c6100b..9d7bf583a 100644
--- a/rtgui/wavelet.cc
+++ b/rtgui/wavelet.cc
@@ -674,7 +674,7 @@ Wavelet::Wavelet() :
     EDmethod->append(M("TP_WAVELET_EDCU"));
     EDmethodconn = EDmethod->signal_changed().connect(sigc::mem_fun(*this, &Wavelet::EDmethodChanged));
     ctboxED->pack_start(*EDmethod);
-    edgBox->pack_start(*ctboxED);
+  //  edgBox->pack_start(*ctboxED);
 
     edgcont->setAdjusterListener(this);
     edgcont->setBgGradient(milestones2);

From 65a258837f200e83cef6c54a00231c053a73b6ed Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Mon, 27 Jul 2020 09:23:39 +0200
Subject: [PATCH 03/10] First normal expert

---
 rtdata/languages/default |   5 ++
 rtengine/procparams.cc   |   4 ++
 rtengine/procparams.h    |   1 +
 rtgui/paramsedited.cc    |   6 ++
 rtgui/paramsedited.h     |   1 +
 rtgui/wavelet.cc         | 122 ++++++++++++++++++++++++++++++++++++++-
 rtgui/wavelet.h          |   9 ++-
 7 files changed, 144 insertions(+), 4 deletions(-)

diff --git a/rtdata/languages/default b/rtdata/languages/default
index a5f77403e..9dc49102a 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -1215,6 +1215,7 @@ HISTORY_MSG_COLORTONING_LABREGION_POWER;CT - region power
 HISTORY_MSG_COLORTONING_LABREGION_SATURATION;CT - Saturation
 HISTORY_MSG_COLORTONING_LABREGION_SHOWMASK;CT - region show mask
 HISTORY_MSG_COLORTONING_LABREGION_SLOPE;CT - region slope
+HISTORY_MSG_COMPLEX;Wavelet complexity
 HISTORY_MSG_DEHAZE_DEPTH;Dehaze - Depth
 HISTORY_MSG_DEHAZE_ENABLED;Haze Removal
 HISTORY_MSG_DEHAZE_LUMINANCE;Dehaze - Luminance only
@@ -3280,6 +3281,10 @@ TP_WAVELET_COLORT;Opacity Red-Green
 TP_WAVELET_COMPCONT;Contrast
 TP_WAVELET_COMPGAMMA;Compression gamma
 TP_WAVELET_COMPGAMMA_TOOLTIP;Adjusting the gamma of the residual image allows you to equilibrate the data and histogram.
+TP_WAVELET_COMPLEXLAB;Complexity
+TP_WAVELET_COMPLEX_TOOLTIP;Allows treatment
+TP_WAVELET_COMPNORMAL;Normal
+TP_WAVELET_COMPEXPERT;Expert
 TP_WAVELET_COMPTM;Tone mapping
 TP_WAVELET_CONTEDIT;'After' contrast curve
 TP_WAVELET_CONTFRAME;Contrast - Compression
diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc
index 863c7fc79..a12ab4ba4 100644
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -2395,6 +2395,7 @@ WaveletParams::WaveletParams() :
     CLmethod("all"),
     Backmethod("grey"),
     Tilesmethod("full"),
+    complexmethod("normal"),
     daubcoeffmethod("4_"),
     CHmethod("without"),
     Medgreinf("less"),
@@ -2527,6 +2528,7 @@ bool WaveletParams::operator ==(const WaveletParams& other) const
         && CLmethod == other.CLmethod
         && Backmethod == other.Backmethod
         && Tilesmethod == other.Tilesmethod
+        && complexmethod == other.complexmethod
         && daubcoeffmethod == other.daubcoeffmethod
         && CHmethod == other.CHmethod
         && Medgreinf == other.Medgreinf
@@ -5988,6 +5990,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
         saveToKeyfile(!pedited || pedited->wavelet.iter, "Wavelet", "Iter", wavelet.iter, keyFile);
         saveToKeyfile(!pedited || pedited->wavelet.thres, "Wavelet", "MaxLev", wavelet.thres, keyFile);
         saveToKeyfile(!pedited || pedited->wavelet.Tilesmethod, "Wavelet", "TilesMethod", wavelet.Tilesmethod, keyFile);
+        saveToKeyfile(!pedited || pedited->wavelet.complexmethod, "Wavelet", "complexMethod", wavelet.complexmethod, keyFile);
         saveToKeyfile(!pedited || pedited->wavelet.daubcoeffmethod, "Wavelet", "DaubMethod", wavelet.daubcoeffmethod, keyFile);
         saveToKeyfile(!pedited || pedited->wavelet.CLmethod, "Wavelet", "ChoiceLevMethod", wavelet.CLmethod, keyFile);
         saveToKeyfile(!pedited || pedited->wavelet.Backmethod, "Wavelet", "BackMethod", wavelet.Backmethod, keyFile);
@@ -7858,6 +7861,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
             assignFromKeyfile(keyFile, "Wavelet", "ChoiceLevMethod", pedited, wavelet.CLmethod, pedited->wavelet.CLmethod);
             assignFromKeyfile(keyFile, "Wavelet", "BackMethod", pedited, wavelet.Backmethod, pedited->wavelet.Backmethod);
             assignFromKeyfile(keyFile, "Wavelet", "TilesMethod", pedited, wavelet.Tilesmethod, pedited->wavelet.Tilesmethod);
+            assignFromKeyfile(keyFile, "Wavelet", "complexMethod", pedited, wavelet.complexmethod, pedited->wavelet.complexmethod);
             assignFromKeyfile(keyFile, "Wavelet", "DaubMethod", pedited, wavelet.daubcoeffmethod, pedited->wavelet.daubcoeffmethod);
             assignFromKeyfile(keyFile, "Wavelet", "CHromaMethod", pedited, wavelet.CHmethod, pedited->wavelet.CHmethod);
             assignFromKeyfile(keyFile, "Wavelet", "Medgreinf", pedited, wavelet.Medgreinf, pedited->wavelet.Medgreinf);
diff --git a/rtengine/procparams.h b/rtengine/procparams.h
index 7d609494e..048fe1ee5 100644
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1790,6 +1790,7 @@ struct WaveletParams {
     Glib::ustring CLmethod;
     Glib::ustring Backmethod;
     Glib::ustring Tilesmethod;
+    Glib::ustring complexmethod;
     Glib::ustring daubcoeffmethod;
     Glib::ustring CHmethod;
     Glib::ustring Medgreinf;
diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc
index db830c6c1..070e31316 100644
--- a/rtgui/paramsedited.cc
+++ b/rtgui/paramsedited.cc
@@ -531,6 +531,7 @@ void ParamsEdited::set(bool v)
     wavelet.CLmethod = v;
     wavelet.Backmethod = v;
     wavelet.Tilesmethod = v;
+    wavelet.complexmethod = v;
     wavelet.daubcoeffmethod = v;
     wavelet.CHmethod = v;
     wavelet.CHSLmethod = v;
@@ -1679,6 +1680,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
         wavelet.CLmethod = wavelet.CLmethod && p.wavelet.CLmethod == other.wavelet.CLmethod;
         wavelet.Backmethod = wavelet.Backmethod && p.wavelet.Backmethod == other.wavelet.Backmethod;
         wavelet.Tilesmethod = wavelet.Tilesmethod && p.wavelet.Tilesmethod == other.wavelet.Tilesmethod;
+        wavelet.complexmethod = wavelet.complexmethod && p.wavelet.complexmethod == other.wavelet.complexmethod;
         wavelet.daubcoeffmethod = wavelet.daubcoeffmethod && p.wavelet.daubcoeffmethod == other.wavelet.daubcoeffmethod;
         wavelet.CHmethod = wavelet.CHmethod && p.wavelet.CHmethod == other.wavelet.CHmethod;
         wavelet.CHSLmethod = wavelet.CHSLmethod && p.wavelet.CHSLmethod == other.wavelet.CHSLmethod;
@@ -5574,6 +5576,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
         toEdit.wavelet.Tilesmethod = mods.wavelet.Tilesmethod;
     }
 
+    if (wavelet.complexmethod) {
+        toEdit.wavelet.complexmethod = mods.wavelet.complexmethod;
+    }
+
     if (wavelet.daubcoeffmethod) {
         toEdit.wavelet.daubcoeffmethod = mods.wavelet.daubcoeffmethod;
     }
diff --git a/rtgui/paramsedited.h b/rtgui/paramsedited.h
index 98a427796..57b6458b9 100644
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -1039,6 +1039,7 @@ struct WaveletParamsEdited {
     bool CLmethod;
     bool Backmethod;
     bool Tilesmethod;
+    bool complexmethod;
     bool daubcoeffmethod;
     bool Dirmethod;
     bool sigma;
diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc
index 9d7bf583a..0fd153d40 100644
--- a/rtgui/wavelet.cc
+++ b/rtgui/wavelet.cc
@@ -158,6 +158,7 @@ Wavelet::Wavelet() :
     HSmethod(Gtk::manage(new MyComboBoxText())),
     CLmethod(Gtk::manage(new MyComboBoxText())),
     Backmethod(Gtk::manage(new MyComboBoxText())),
+    complexmethod(Gtk::manage(new MyComboBoxText())),
     Tilesmethod(Gtk::manage(new MyComboBoxText())),
     daubcoeffmethod(Gtk::manage(new MyComboBoxText())),
     Dirmethod(Gtk::manage(new MyComboBoxText())),
@@ -190,7 +191,9 @@ Wavelet::Wavelet() :
     expclari(Gtk::manage(new MyExpander(true, M("TP_WAVELET_CLARI")))),
     expbl(Gtk::manage(new MyExpander(true, M("TP_WAVELET_BL")))),
     neutrHBox(Gtk::manage(new Gtk::HBox())),
-    usharpHBox(Gtk::manage(new Gtk::HBox()))
+    usharpHBox(Gtk::manage(new Gtk::HBox())),
+    ctboxch(Gtk::manage(new Gtk::HBox()))
+
 {
     CurveListener::setMulti(true);
     auto m = ProcEventMapper::getInstance();
@@ -227,6 +230,7 @@ Wavelet::Wavelet() :
     EvWavrangeab = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_RANGEAB");
     EvWavprotab = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_PROTAB");
     EvWavlevelshc = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_LEVELSHC");
+    EvWavcomplexmet = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_COMPLEX");
 
     labgrid = Gtk::manage(new LabGrid(EvWavLabGridValue, M("TP_WAVELET_LABGRID_VALUES")));
 
@@ -269,6 +273,16 @@ Wavelet::Wavelet() :
     thres->set_tooltip_text(M("TP_WAVELET_LEVELS_TOOLTIP"));
     thres->setAdjusterListener(this);
 
+    complexmethod->append(M("TP_WAVELET_COMPNORMAL"));
+    complexmethod->append(M("TP_WAVELET_COMPEXPERT"));
+    complexmethodconn = complexmethod->signal_changed().connect(sigc::mem_fun(*this, &Wavelet::complexmethodChanged));
+    complexmethod->set_tooltip_text(M("TP_WAVELET_COMPLEX_TOOLTIP"));
+    Gtk::HBox* const complexHBox = Gtk::manage(new Gtk::HBox());
+    Gtk::Label* const complexLabel = Gtk::manage(new Gtk::Label(M("TP_WAVELET_COMPLEXLAB") + ":"));
+    complexHBox->pack_start(*complexLabel, Gtk::PACK_SHRINK, 4);
+    complexHBox->pack_start(*complexmethod);
+
+
     Tilesmethod->append(M("TP_WAVELET_TILESFULL"));
     Tilesmethod->append(M("TP_WAVELET_TILESBIG"));
 //    Tilesmethod->append(M("TP_WAVELET_TILESLIT"));
@@ -335,6 +349,7 @@ Wavelet::Wavelet() :
     levdirSubHBox->pack_start(*Lmethod);
     levdirSubHBox->pack_start(*Dirmethod, Gtk::PACK_EXPAND_WIDGET, 2); // same, but 2 not 4?
 
+    settingsBox->pack_start(*complexHBox);
     settingsBox->pack_start(*strength);
     settingsBox->pack_start(*thres);
     settingsBox->pack_start(*tilesizeHBox);
@@ -452,7 +467,7 @@ Wavelet::Wavelet() :
     ToolParamBlock* const chBox = Gtk::manage(new ToolParamBlock());
 
     Gtk::Label* const labmch = Gtk::manage(new Gtk::Label(M("TP_WAVELET_CHTYPE") + ":"));
-    Gtk::HBox* const ctboxch = Gtk::manage(new Gtk::HBox());
+//    Gtk::HBox* const ctboxch = Gtk::manage(new Gtk::HBox());
     ctboxch->pack_start(*labmch, Gtk::PACK_SHRINK, 1);
 
     CHmethod->append(M("TP_WAVELET_CH1"));
@@ -1236,6 +1251,7 @@ void Wavelet::read(const ProcParams* pp, const ParamsEdited* pedited)
     CLmethodconn.block(true);
     Backmethodconn.block(true);
     Tilesmethodconn.block(true);
+    complexmethodconn.block(true);
     daubcoeffmethodconn.block(true);
     Dirmethodconn.block(true);
     CHmethodconn.block(true);
@@ -1357,6 +1373,12 @@ void Wavelet::read(const ProcParams* pp, const ParamsEdited* pedited)
     } else if (pp->wavelet.CLmethod == "all") {
         CLmethod->set_active(3);
     }
+    if (pp->wavelet.complexmethod == "normal") {
+        complexmethod->set_active(0);
+    } else if (pp->wavelet.complexmethod == "expert") {
+        complexmethod->set_active(1);
+    }
+
 
     //Tilesmethod->set_active (2);
     if (pp->wavelet.Tilesmethod == "full") {
@@ -1558,6 +1580,11 @@ void Wavelet::read(const ProcParams* pp, const ParamsEdited* pedited)
             Backmethod->set_active_text(M("GENERAL_UNCHANGED"));
         }
 
+        if (!pedited->wavelet.complexmethod) {
+            complexmethod->set_active_text(M("GENERAL_UNCHANGED"));
+        }
+
+
         if (!pedited->wavelet.Tilesmethod) {
             Tilesmethod->set_active_text(M("GENERAL_UNCHANGED"));
         }
@@ -1774,6 +1801,15 @@ void Wavelet::read(const ProcParams* pp, const ParamsEdited* pedited)
         } else {
             sup->hide();
         }
+        
+    if (complexmethod->get_active_row_number() == 0) {
+        updateGUIToMode(0);
+        convertParamToNormal();
+
+    } else {
+        updateGUIToMode(1);
+    }
+        
     }
 
     /*****************************************************************************************************
@@ -1786,6 +1822,7 @@ void Wavelet::read(const ProcParams* pp, const ParamsEdited* pedited)
     CLmethodconn.block(false);
     Backmethodconn.block(false);
     Tilesmethodconn.block(false);
+    complexmethodconn.block(false);
     daubcoeffmethodconn.block(false);
     CHmethodconn.block(false);
     CHSLmethodconn.block(false);
@@ -1965,6 +2002,7 @@ void Wavelet::write(ProcParams* pp, ParamsEdited* pedited)
         pedited->wavelet.CLmethod        = CLmethod->get_active_text() != M("GENERAL_UNCHANGED");
         pedited->wavelet.Backmethod      = Backmethod->get_active_text() != M("GENERAL_UNCHANGED");
         pedited->wavelet.Tilesmethod     = Tilesmethod->get_active_text() != M("GENERAL_UNCHANGED");
+        pedited->wavelet.complexmethod   = complexmethod->get_active_text() != M("GENERAL_UNCHANGED");
         pedited->wavelet.daubcoeffmethod = daubcoeffmethod->get_active_text() != M("GENERAL_UNCHANGED");
         pedited->wavelet.CHmethod        = CHmethod->get_active_text() != M("GENERAL_UNCHANGED");
         pedited->wavelet.CHSLmethod      = CHSLmethod->get_active_text() != M("GENERAL_UNCHANGED");
@@ -2168,6 +2206,12 @@ void Wavelet::write(ProcParams* pp, ParamsEdited* pedited)
 //        pp->wavelet.Tilesmethod = "lit";
     }
 
+    if (complexmethod->get_active_row_number() == 0) {
+        pp->wavelet.complexmethod = "normal";
+    } else if (complexmethod->get_active_row_number() == 1) {
+        pp->wavelet.complexmethod = "expert";
+    }
+
     if (daubcoeffmethod->get_active_row_number() == 0) {
         pp->wavelet.daubcoeffmethod = "2_";
     } else if (daubcoeffmethod->get_active_row_number() == 1) {
@@ -2835,6 +2879,79 @@ void Wavelet::ushamethodChanged()
 }
 
 
+
+void Wavelet::convertParamToNormal()
+{
+    const WaveletParams def_params;
+    disableListener();
+    //contrast
+    offset->setValue(def_params.offset);
+    //chroma
+    expchroma->setEnabled(def_params.expchroma);
+    CHmethod->set_active(2);
+    //denoise
+    chromfi->setValue(def_params.chromfi);
+    chromco->setValue(def_params.chromco);
+    //toning
+    exptoning->setEnabled(def_params.exptoning);
+    //gamut
+    median->set_active(def_params.median);
+    avoid->set_active(def_params.avoid);
+    hueskin->setValue(def_params.hueskin);
+    skinprotect->setValue(def_params.skinprotect);
+    //blur
+    expbl->setEnabled(def_params.expbl);
+    //edge sharpness
+    lipst->set_active(def_params.lipst);
+    lipstUpdateUI();
+    edgesensi->setValue(def_params.edgesensi);
+    edgeampli->setValue(def_params.edgeampli);
+    NPmethod->set_active(0);
+    enableListener();
+
+    // Update GUI based on converted widget parameters:
+}
+
+void Wavelet::updateGUIToMode(int mode)
+{
+    if(mode ==0) {
+        offset->hide();
+        ctboxch->hide();
+        expgamut->hide();
+        exptoning->hide();
+        chroFrame->hide();
+        expbl->hide();
+        lipst->hide();
+    } else {
+        offset->show();
+        ctboxch->show();
+        expgamut->show();
+        exptoning->show();
+        chroFrame->show();
+        expbl->show();
+        lipst->show();
+    }
+
+}
+
+
+void Wavelet::complexmethodChanged()
+{    
+    if (complexmethod->get_active_row_number() == 0) {
+        updateGUIToMode(0);
+        convertParamToNormal();
+
+    } else {
+        updateGUIToMode(1);
+    }
+
+    if (listener && (multiImage || getEnabled())) {
+        listener->panelChanged(EvWavcomplexmet, complexmethod->get_active_text());
+    }
+}
+
+
+
 void Wavelet::TilesmethodChanged()
 {
     //TilesmethodUpdateUI();
@@ -2916,6 +3033,7 @@ void Wavelet::setBatchMode(bool batchMode)
     CLmethod->append(M("GENERAL_UNCHANGED"));
     Backmethod->append(M("GENERAL_UNCHANGED"));
     Tilesmethod->append(M("GENERAL_UNCHANGED"));
+    complexmethod->append(M("GENERAL_UNCHANGED"));
     daubcoeffmethod->append(M("GENERAL_UNCHANGED"));
     CHmethod->append(M("GENERAL_UNCHANGED"));
     Medgreinf->append(M("GENERAL_UNCHANGED"));
diff --git a/rtgui/wavelet.h b/rtgui/wavelet.h
index 6daabcd67..127be0efa 100644
--- a/rtgui/wavelet.h
+++ b/rtgui/wavelet.h
@@ -47,7 +47,6 @@ class Wavelet final :
 public:
     Wavelet();
     ~Wavelet() override;
-
     bool wavComputed_();
     void adjusterChanged(Adjuster* a, double newval) override;
     void autoOpenCurve() override;
@@ -102,6 +101,7 @@ private:
     rtengine::ProcEvent EvWavrangeab;
     rtengine::ProcEvent EvWavprotab;
     rtengine::ProcEvent EvWavlevelshc;
+    rtengine::ProcEvent EvWavcomplexmet;
 
     LabGrid *labgrid;
 
@@ -121,6 +121,7 @@ private:
     void LmethodChanged();
     void MedgreinfChanged();
     void TMmethodChanged();
+    void complexmethodChanged();
     void TilesmethodChanged();
     void avoidToggled();
     void showmaskToggled ();
@@ -143,7 +144,8 @@ private:
     void ushamethodChanged();
     void updateGUI();
     void updateGUImaxlev();
-
+    void convertParamToNormal();
+    void updateGUIToMode(int mode);
     void HSmethodUpdateUI();
     void CHmethodUpdateUI();
 //  void CHSLmethodChangedUI();
@@ -297,6 +299,8 @@ private:
     sigc::connection  CLmethodconn;
     MyComboBoxText* const Backmethod;
     sigc::connection  Backmethodconn;
+    MyComboBoxText* const complexmethod;
+    sigc::connection  complexmethodconn;
     MyComboBoxText* const Tilesmethod;
     sigc::connection  Tilesmethodconn;
     MyComboBoxText* const daubcoeffmethod;
@@ -338,6 +342,7 @@ private:
 
     Gtk::HBox* const neutrHBox;
     Gtk::HBox* const usharpHBox;
+    Gtk::HBox* const ctboxch;
 
     sigc::connection enableChromaConn, enableContrastConn, enableEdgeConn, enabletmConn, enableFinalConn, enableclariConn;
     sigc::connection enableNoiseConn, enableResidConn, enableToningConn;

From 05830912f78436fc916bf459fbec9977198f5f20 Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Mon, 27 Jul 2020 11:09:21 +0200
Subject: [PATCH 04/10] Second normal expert

---
 rtgui/wavelet.cc | 21 +++++++++++++++++++--
 rtgui/wavelet.h  |  1 +
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc
index 0fd153d40..ee251f35f 100644
--- a/rtgui/wavelet.cc
+++ b/rtgui/wavelet.cc
@@ -192,7 +192,8 @@ Wavelet::Wavelet() :
     expbl(Gtk::manage(new MyExpander(true, M("TP_WAVELET_BL")))),
     neutrHBox(Gtk::manage(new Gtk::HBox())),
     usharpHBox(Gtk::manage(new Gtk::HBox())),
-    ctboxch(Gtk::manage(new Gtk::HBox()))
+    ctboxch(Gtk::manage(new Gtk::HBox())),
+    ctboxBA(Gtk::manage(new Gtk::VBox()))
 
 {
     CurveListener::setMulti(true);
@@ -1022,7 +1023,7 @@ Wavelet::Wavelet() :
     resBox->pack_start(*neutrHBox);
 
 // Final Touchup
-    Gtk::VBox* const ctboxBA = Gtk::manage(new Gtk::VBox());
+ //   Gtk::VBox* const ctboxBA = Gtk::manage(new Gtk::VBox());
 
     ctboxBA->set_spacing(2);
 
@@ -2907,6 +2908,14 @@ void Wavelet::convertParamToNormal()
     edgesensi->setValue(def_params.edgesensi);
     edgeampli->setValue(def_params.edgeampli);
     NPmethod->set_active(0);
+    //resid
+    oldsh->set_active(true);
+    resblur->setValue(def_params.resblur);
+    resblurc->setValue(def_params.resblurc);
+    cbenab->set_active(false);
+
+    //final touchup
+    BAmethod->set_active(0);    
     enableListener();
 
     // Update GUI based on converted widget parameters:
@@ -2922,6 +2931,10 @@ void Wavelet::updateGUIToMode(int mode)
         chroFrame->hide();
         expbl->hide();
         lipst->hide();
+        dirFrame->hide();
+        oldsh->hide();
+        blurFrame->hide();
+        cbenab->hide();
     } else {
         offset->show();
         ctboxch->show();
@@ -2930,6 +2943,10 @@ void Wavelet::updateGUIToMode(int mode)
         chroFrame->show();
         expbl->show();
         lipst->show();
+        dirFrame->show();
+        oldsh->show();
+        blurFrame->show();
+        cbenab->show();
     }
 
 }
diff --git a/rtgui/wavelet.h b/rtgui/wavelet.h
index 127be0efa..a497d2c4f 100644
--- a/rtgui/wavelet.h
+++ b/rtgui/wavelet.h
@@ -343,6 +343,7 @@ private:
     Gtk::HBox* const neutrHBox;
     Gtk::HBox* const usharpHBox;
     Gtk::HBox* const ctboxch;
+    Gtk::VBox* const ctboxBA;// = Gtk::manage(new Gtk::VBox());
 
     sigc::connection enableChromaConn, enableContrastConn, enableEdgeConn, enabletmConn, enableFinalConn, enableclariConn;
     sigc::connection enableNoiseConn, enableResidConn, enableToningConn;

From f08da7b99940597a72f7e106b692c7b3f8d64eef Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Mon, 27 Jul 2020 16:41:28 +0200
Subject: [PATCH 05/10] Changes in normal expert contrast chroma residual

---
 rtengine/ipwavelet.cc |  6 ++++--
 rtgui/wavelet.cc      | 18 +++++++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc
index b2ae5fc1d..c2798af77 100644
--- a/rtengine/ipwavelet.cc
+++ b/rtengine/ipwavelet.cc
@@ -2079,7 +2079,8 @@ void ImProcFunctions::WaveletcontAllL(LabImage * labco, float ** varhue, float *
         ContrastResid(WavCoeffs_L0, cp, W_L, H_L, maxp);
     }
 
-    if ((cp.conres >= 0.f || cp.conresH >= 0.f) && cp.resena && !cp.oldsh) { // cp.conres = 0.f and cp.comresH = 0.f means that all will be multiplied by 1.f, so we can skip this step
+ //   if ((cp.conres >= 0.f || cp.conresH >= 0.f) && cp.resena && !cp.oldsh) { // cp.conres = 0.f and cp.comresH = 0.f means that all will be multiplied by 1.f, so we can skip this step
+    if ((cp.conres >= 0.f || cp.conresH >= 0.f) && cp.resena) { // cp.conres = 0.f and cp.comresH = 0.f means that all will be multiplied by 1.f, so we can skip this step
         const std::unique_ptr<LabImage> temp(new LabImage(W_L, H_L));
 #ifdef _OPENMP
         #pragma omp parallel for num_threads(wavNestedLevels) if (wavNestedLevels>1)
@@ -2104,7 +2105,8 @@ void ImProcFunctions::WaveletcontAllL(LabImage * labco, float ** varhue, float *
         }
     }
 
-    if ((cp.conres != 0.f || cp.conresH != 0.f) && cp.resena && cp.oldsh) { // cp.conres = 0.f and cp.comresH = 0.f means that all will be multiplied by 1.f, so we can skip this step
+  //  if ((cp.conres != 0.f || cp.conresH != 0.f) && cp.resena && cp.oldsh) { // cp.conres = 0.f and cp.comresH = 0.f means that all will be multiplied by 1.f, so we can skip this step
+    if ((cp.conres < 0.f || cp.conresH < 0.f) && cp.resena) { // cp.conres = 0.f and cp.comresH = 0.f means that all will be multiplied by 1.f, so we can skip this step
 #ifdef _OPENMP
         #pragma omp parallel for
 #endif
diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc
index ee251f35f..79f4f4e25 100644
--- a/rtgui/wavelet.cc
+++ b/rtgui/wavelet.cc
@@ -854,7 +854,7 @@ Wavelet::Wavelet() :
     thrH->setAdjusterListener(this);
 
     radius->setAdjusterListener(this);
-    radius->hide();
+//    radius->hide();
 
     shFrame->set_label_align(0.025, 0.5);
     ToolParamBlock* const shBox = Gtk::manage(new ToolParamBlock());
@@ -2887,8 +2887,11 @@ void Wavelet::convertParamToNormal()
     disableListener();
     //contrast
     offset->setValue(def_params.offset);
+    sigma->setValue(def_params.sigma);
+    lowthr->setValue(def_params.lowthr);
     //chroma
     expchroma->setEnabled(def_params.expchroma);
+    sigmacol->setValue(def_params.sigmacol);
     CHmethod->set_active(2);
     //denoise
     chromfi->setValue(def_params.chromfi);
@@ -2909,7 +2912,8 @@ void Wavelet::convertParamToNormal()
     edgeampli->setValue(def_params.edgeampli);
     NPmethod->set_active(0);
     //resid
-    oldsh->set_active(true);
+ //   oldsh->set_active(true);
+    radius->setValue(def_params.radius);
     resblur->setValue(def_params.resblur);
     resblurc->setValue(def_params.resblurc);
     cbenab->set_active(false);
@@ -2925,7 +2929,10 @@ void Wavelet::updateGUIToMode(int mode)
 {
     if(mode ==0) {
         offset->hide();
+        sigma->hide();
+        lowthr->hide();
         ctboxch->hide();
+        sigmacol->hide();
         expgamut->hide();
         exptoning->hide();
         chroFrame->hide();
@@ -2933,18 +2940,23 @@ void Wavelet::updateGUIToMode(int mode)
         lipst->hide();
         dirFrame->hide();
         oldsh->hide();
+        radius->hide();
         blurFrame->hide();
         cbenab->hide();
     } else {
         offset->show();
+        sigma->show();
+        lowthr->show();
         ctboxch->show();
+        sigmacol->show();
         expgamut->show();
         exptoning->show();
         chroFrame->show();
         expbl->show();
         lipst->show();
         dirFrame->show();
-        oldsh->show();
+        oldsh->hide();
+        radius->show();
         blurFrame->show();
         cbenab->show();
     }

From 3101fb2b56848c7156ddfa15424e177e9f0c4117 Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Tue, 28 Jul 2020 20:45:06 +0200
Subject: [PATCH 06/10] Change label complexity wavelet

---
 rtdata/languages/default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rtdata/languages/default b/rtdata/languages/default
index 9dc49102a..87b39be78 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -3283,8 +3283,8 @@ TP_WAVELET_COMPGAMMA;Compression gamma
 TP_WAVELET_COMPGAMMA_TOOLTIP;Adjusting the gamma of the residual image allows you to equilibrate the data and histogram.
 TP_WAVELET_COMPLEXLAB;Complexity
 TP_WAVELET_COMPLEX_TOOLTIP;Allows treatment
-TP_WAVELET_COMPNORMAL;Normal
-TP_WAVELET_COMPEXPERT;Expert
+TP_WAVELET_COMPNORMAL;Standard
+TP_WAVELET_COMPEXPERT;Advanced
 TP_WAVELET_COMPTM;Tone mapping
 TP_WAVELET_CONTEDIT;'After' contrast curve
 TP_WAVELET_CONTFRAME;Contrast - Compression

From 40e6614d59c55b52228f11fa32da6be9cd045862 Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Wed, 29 Jul 2020 07:05:05 +0200
Subject: [PATCH 07/10] French + hide sigmafin standard

---
 rtdata/languages/Francais | 1 +
 rtgui/wavelet.cc          | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index 52d25d85b..0e8635484 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -2653,6 +2653,7 @@ TP_WAVELET_CHR_TOOLTIP;Ajuste le chroma en fonction des "niveaux de contraste" e
 TP_WAVELET_CHSL;Curseurs
 TP_WAVELET_CHTYPE;Méthode de chrominance
 TP_WAVELET_COLORT;Opacité Rouge-Vert
+TP_WAVELET_COMPEXPERT;Avancé
 TP_WAVELET_COMPCONT;Contraste
 TP_WAVELET_COMPGAMMA;Compression gamma
 TP_WAVELET_COMPGAMMA_TOOLTIP;Ajuster le gamma de l'image résiduelle vous permet d'équiilibrer les données de l'histogramme.
diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc
index 79f4f4e25..8bd074867 100644
--- a/rtgui/wavelet.cc
+++ b/rtgui/wavelet.cc
@@ -2921,6 +2921,7 @@ void Wavelet::convertParamToNormal()
     //final touchup
     BAmethod->set_active(0);    
     enableListener();
+    sigmafin->setValue(def_params.sigmafin);
 
     // Update GUI based on converted widget parameters:
 }
@@ -2943,6 +2944,7 @@ void Wavelet::updateGUIToMode(int mode)
         radius->hide();
         blurFrame->hide();
         cbenab->hide();
+        sigmafin->hide();
     } else {
         offset->show();
         sigma->show();
@@ -2959,6 +2961,7 @@ void Wavelet::updateGUIToMode(int mode)
         radius->show();
         blurFrame->show();
         cbenab->show();
+        sigmafin->show();
     }
 
 }

From afa62a2240f58bc0092e914b7118bf59a6bb24ac Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Wed, 29 Jul 2020 15:18:34 +0200
Subject: [PATCH 08/10] Added tooltip complexty wavelet

---
 rtdata/languages/Francais | 1 +
 rtdata/languages/default  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index 0e8635484..d541234cf 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -2653,6 +2653,7 @@ TP_WAVELET_CHR_TOOLTIP;Ajuste le chroma en fonction des "niveaux de contraste" e
 TP_WAVELET_CHSL;Curseurs
 TP_WAVELET_CHTYPE;Méthode de chrominance
 TP_WAVELET_COLORT;Opacité Rouge-Vert
+TP_WAVELET_COMPLEX_TOOLTIP;Standard: l’application dispose du nécessaire pour assurer les opérations courantes, l’interface graphique est simplifiée.\nAvancé: toutes les fonctionnalités sont présentes, certaines nécessitent un apprentissage important
 TP_WAVELET_COMPEXPERT;Avancé
 TP_WAVELET_COMPCONT;Contraste
 TP_WAVELET_COMPGAMMA;Compression gamma
diff --git a/rtdata/languages/default b/rtdata/languages/default
index 87b39be78..f00d9411e 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -3282,7 +3282,7 @@ TP_WAVELET_COMPCONT;Contrast
 TP_WAVELET_COMPGAMMA;Compression gamma
 TP_WAVELET_COMPGAMMA_TOOLTIP;Adjusting the gamma of the residual image allows you to equilibrate the data and histogram.
 TP_WAVELET_COMPLEXLAB;Complexity
-TP_WAVELET_COMPLEX_TOOLTIP;Allows treatment
+TP_WAVELET_COMPLEX_TOOLTIP;Standard: shows a reduced set of tools suitable for most processing operations.\nAdvanced: shows the complete set of tools for advanced processing operations
 TP_WAVELET_COMPNORMAL;Standard
 TP_WAVELET_COMPEXPERT;Advanced
 TP_WAVELET_COMPTM;Tone mapping

From 6e4efb55c1ec3b03f7c8d66ff740c3773b83f247 Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Wed, 5 Aug 2020 07:13:49 +0200
Subject: [PATCH 09/10] Change labels and tooltip

---
 rtdata/languages/default | 110 +++++++++++++++++++--------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/rtdata/languages/default b/rtdata/languages/default
index f00d9411e..687e6cec0 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -568,10 +568,10 @@ HISTORY_MSG_314;W - Gamut - Reduce artifacts
 HISTORY_MSG_315;W - Residual - Contrast
 HISTORY_MSG_316;W - Gamut - Skin tar/prot
 HISTORY_MSG_317;W - Gamut - Skin hue
-HISTORY_MSG_318;W - Contrast - Fine levels
-HISTORY_MSG_319;W - Contrast - Fine range
-HISTORY_MSG_320;W - Contrast - Coarse range
-HISTORY_MSG_321;W - Contrast - Coarse levels
+HISTORY_MSG_318;W - Contrast - Finer levels
+HISTORY_MSG_319;W - Contrast - Finer range
+HISTORY_MSG_320;W - Contrast - Coarser range
+HISTORY_MSG_321;W - Contrast - Coarser levels
 HISTORY_MSG_322;W - Gamut - Avoid color shift
 HISTORY_MSG_323;W - ES - Local contrast
 HISTORY_MSG_324;W - Chroma - Pastel
@@ -635,14 +635,14 @@ HISTORY_MSG_381;PRS RLD - Radius
 HISTORY_MSG_382;PRS RLD - Amount
 HISTORY_MSG_383;PRS RLD - Damping
 HISTORY_MSG_384;PRS RLD - Iterations
-HISTORY_MSG_385;W - Residual - Color Balance
+HISTORY_MSG_385;W - Residual - Color balance
 HISTORY_MSG_386;W - Residual - CB green high
 HISTORY_MSG_387;W - Residual - CB blue high
 HISTORY_MSG_388;W - Residual - CB green mid
 HISTORY_MSG_389;W - Residual - CB blue mid
 HISTORY_MSG_390;W - Residual - CB green low
 HISTORY_MSG_391;W - Residual - CB blue low
-HISTORY_MSG_392;W - Residual - Color Balance
+HISTORY_MSG_392;W - Residual - Color balance
 HISTORY_MSG_393;DCP - Look table
 HISTORY_MSG_394;DCP - Baseline exposure
 HISTORY_MSG_395;DCP - Base table
@@ -1198,7 +1198,7 @@ HISTORY_MSG_956;Local - CH Curve
 HISTORY_MSG_BLSHAPE;Blur by level
 HISTORY_MSG_BLURCWAV;Blur chroma
 HISTORY_MSG_BLURWAV;Blur luminance
-HISTORY_MSG_BLUWAV;Attenuation Response
+HISTORY_MSG_BLUWAV;Attenuation response
 HISTORY_MSG_CAT02PRESET;Cat02 automatic preset
 HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
 HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
@@ -1223,7 +1223,7 @@ HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;Dehaze - Show depth map
 HISTORY_MSG_DEHAZE_STRENGTH;Dehaze - Strength
 HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST;Dual demosaic - Auto threshold
 HISTORY_MSG_DUALDEMOSAIC_CONTRAST;Dual demosaic - Contrast threshold
-HISTORY_MSG_EDGEFFECT;Edge Attenuation Response
+HISTORY_MSG_EDGEFFECT;Edge Attenuation response
 HISTORY_MSG_FILMNEGATIVE_ENABLED;Film Negative
 HISTORY_MSG_FILMNEGATIVE_FILMBASE;Film base color
 HISTORY_MSG_FILMNEGATIVE_VALUES;Film negative values
@@ -1270,10 +1270,10 @@ HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling
 HISTORY_MSG_SHARPENING_BLUR;Sharpening - Blur radius
 HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
 HISTORY_MSG_SH_COLORSPACE;S/H - Colorspace
-HISTORY_MSG_SIGMACOL;Chroma Attenuation Response
-HISTORY_MSG_SIGMADIR;Dir Attenuation Response
-HISTORY_MSG_SIGMAFIN;Final contrast Attenuation Response
-HISTORY_MSG_SIGMATON;Toning Attenuation Response
+HISTORY_MSG_SIGMACOL;Chroma Attenuation response
+HISTORY_MSG_SIGMADIR;Dir Attenuation response
+HISTORY_MSG_SIGMAFIN;Final contrast Attenuation response
+HISTORY_MSG_SIGMATON;Toning Attenuation response
 HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
 HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
 HISTORY_MSG_TEMPOUT;CAM02 automatic temperature
@@ -1292,10 +1292,10 @@ HISTORY_MSG_WAVMERGEC;Merge C
 HISTORY_MSG_WAVMERGEL;Merge L
 HISTORY_MSG_WAVOFFSET;Offset
 HISTORY_MSG_WAVOLDSH;Old algorithm
-HISTORY_MSG_WAVRADIUS;Radius Shadows-Highlight
+HISTORY_MSG_WAVRADIUS;Radius shadows-highlights
 HISTORY_MSG_WAVSCALE;Scale
 HISTORY_MSG_WAVSHOWMASK;Show wavelet mask
-HISTORY_MSG_WAVSIGMA;Attenuation Response
+HISTORY_MSG_WAVSIGMA;Attenuation response
 HISTORY_MSG_WAVSOFTRAD;Soft radius clarity
 HISTORY_MSG_WAVSOFTRADEND;Soft radius final
 HISTORY_MSG_WAVUSHAMET;Clarity method
@@ -3237,18 +3237,18 @@ TP_WAVELET_6;Level 6
 TP_WAVELET_7;Level 7
 TP_WAVELET_8;Level 8
 TP_WAVELET_9;Level 9
-TP_WAVELET_APPLYTO;Apply To
+TP_WAVELET_APPLYTO;Apply to
 TP_WAVELET_AVOID;Avoid color shift
 TP_WAVELET_B0;Black
-TP_WAVELET_B1;Grey
+TP_WAVELET_B1;Gray
 TP_WAVELET_B2;Residual
 TP_WAVELET_BACKGROUND;Background
 TP_WAVELET_BACUR;Curve
 TP_WAVELET_BALANCE;Contrast balance d/v-h
 TP_WAVELET_BALANCE_TOOLTIP;Alters the balance between the wavelet directions: vertical-horizontal and diagonal.\nIf contrast, chroma or residual tone mapping are activated, the effect due to balance is amplified.
-TP_WAVELET_BALCHRO;Chrominance balance
-TP_WAVELET_BALCHROM;Denoise Equalizer  Blue-yellow Red-green
+TP_WAVELET_BALANCE_TOOLTIP;Alters the balance between the vertical, horizontal and diagonal wavelet directions: .\nActivating contrast, chroma or residual tone mapping amplifies the effect due to balance
 TP_WAVELET_BALCHRO_TOOLTIP;If enabled, the 'Contrast balance' curve or slider also modifies chroma balance.
+TP_WAVELET_BALCHROM;Denoise equalizer  blue-yellow red-green
 TP_WAVELET_BALLUM;Denoise Equalizer  White-Black
 TP_WAVELET_BANONE;None
 TP_WAVELET_BASLI;Slider
@@ -3256,9 +3256,9 @@ TP_WAVELET_BATYPE;Contrast balance method
 TP_WAVELET_BL;Blur levels
 TP_WAVELET_BLCURVE;Blur by levels
 TP_WAVELET_BLURFRAME;Blur
-TP_WAVELET_BLUWAV;Attenuation Response
-TP_WAVELET_CBENAB;Toning and Color Balance
-TP_WAVELET_CB_TOOLTIP;For strong values product color-toning by combining it or not with levels decomposition 'toning'\nFor low values you can change the white balance of the background (sky, ...) without changing that of the front plane, generally more contrasted
+TP_WAVELET_BLUWAV;Attenuation response
+TP_WAVELET_CBENAB;Toning and Color balance
+TP_WAVELET_CB_TOOLTIP;With high values you can create special effects, similar to those achieved with the Chroma Module, but focused on the residual image\nWith moderate values you can manually correct the white balance
 TP_WAVELET_CCURVE;Local contrast
 TP_WAVELET_CH1;Whole chroma range
 TP_WAVELET_CH2;Saturated/pastel
@@ -3266,7 +3266,7 @@ TP_WAVELET_CH3;Link contrast levels
 TP_WAVELET_CHCU;Curve
 TP_WAVELET_CHR;Chroma-contrast link strength
 TP_WAVELET_CHRO;Saturated/pastel threshold
-TP_WAVELET_CHROFRAME;Denoise Chrominance
+TP_WAVELET_CHROFRAME;Denoise chrominance
 TP_WAVELET_CHROMAFRAME;Chroma
 TP_WAVELET_CHROMCO;Chrominance Coarse
 TP_WAVELET_CHROMFI;Chrominance Fine
@@ -3277,7 +3277,7 @@ TP_WAVELET_CHSL;Sliders
 TP_WAVELET_CHTYPE;Chrominance method
 TP_WAVELET_CLA;Clarity
 TP_WAVELET_CLARI;Sharp-mask and Clarity
-TP_WAVELET_COLORT;Opacity Red-Green
+TP_WAVELET_COLORT;Opacity red-green
 TP_WAVELET_COMPCONT;Contrast
 TP_WAVELET_COMPGAMMA;Compression gamma
 TP_WAVELET_COMPGAMMA_TOOLTIP;Adjusting the gamma of the residual image allows you to equilibrate the data and histogram.
@@ -3293,16 +3293,16 @@ TP_WAVELET_CONTRA;Contrast
 TP_WAVELET_CONTRASTEDIT;Finer - Coarser levels
 TP_WAVELET_CONTRAST_MINUS;Contrast -
 TP_WAVELET_CONTRAST_PLUS;Contrast +
-TP_WAVELET_CONTRA_TOOLTIP;Changes contrast of the residual image.
+TP_WAVELET_CONTRA_TOOLTIP;Changes the residual image contrast.
 TP_WAVELET_CTYPE;Chrominance control
 TP_WAVELET_CURVEEDITOR_BL_TOOLTIP;Disabled if zoom > about 300%
 TP_WAVELET_CURVEEDITOR_CC_TOOLTIP;Modifies local contrast as a function of the original local contrast (abscissa).\nLow abscissa values represent small local contrast (real values about 10..20).\n50% abscissa represents average local contrast (real value about 100..300).\n66% abscissa represents standard deviation of local contrast (real value about 300..800).\n100% abscissa represents maximum local contrast (real value about 3000..8000).
 TP_WAVELET_CURVEEDITOR_CH;Contrast levels=f(Hue)
 TP_WAVELET_CURVEEDITOR_CH_TOOLTIP;Modifies each level's contrast as a function of hue.\nTake care not to overwrite changes made with the Gamut sub-tool's hue controls.\nThe curve will only have an effect when wavelet contrast level sliders are non-zero.
 TP_WAVELET_CURVEEDITOR_CL;L
-TP_WAVELET_CURVEEDITOR_CL_TOOLTIP;Applies a final contrast luminance curve at the end of the wavelet treatment.
+TP_WAVELET_CURVEEDITOR_CL_TOOLTIP;Applies a final contrast-luminance curve at the end of the wavelet  processing.
 TP_WAVELET_CURVEEDITOR_HH;HH
-TP_WAVELET_CURVEEDITOR_HH_TOOLTIP;Modifies the residual image's hue as a function of hue.
+TP_WAVELET_CURVEEDITOR_HH_TOOLTIP;Modifies the residual image hue as a function of hue.
 TP_WAVELET_DALL;All directions
 TP_WAVELET_DAUB;Edge performance
 TP_WAVELET_DAUB2;D2 - low
@@ -3311,34 +3311,34 @@ TP_WAVELET_DAUB6;D6 - standard plus
 TP_WAVELET_DAUB10;D10 - medium
 TP_WAVELET_DAUB14;D14 - high
 TP_WAVELET_DAUBLOCAL;Wavelet Edge performance
-TP_WAVELET_DAUB_TOOLTIP;Changes Daubechies coefficients:\nD4 = Standard,\nD14 = Often best performance, 10% more time-intensive.\n\nAffects edge detection as well as the general quality of the firsts levels. However the quality is not strictly related to this coefficient and can vary with images and uses.
+TP_WAVELET_DAUB_TOOLTIP;Changes Daubechies coefficients:\nD4 = Standard,\nD14 = Often best performance, 10% more time-intensive.\n\nAffects edge detection as well as the general quality of the first levels. However the quality is not strictly related to this coefficient and can vary depending on image and use.
 TP_WAVELET_DIRFRAME;Directional contrast
 TP_WAVELET_DONE;Vertical
 TP_WAVELET_DTHR;Diagonal
 TP_WAVELET_DTWO;Horizontal
 TP_WAVELET_EDCU;Curve
-TP_WAVELET_EDEFFECT;Attenuation Response
-TP_WAVELET_EDEFFECT_TOOLTIP;This slider controls how wide the range of contrast values are that receive the maximum effect from the tool.\nMaximum value (2.5) disabled the tool
+TP_WAVELET_EDEFFECT;Attenuation response
+TP_WAVELET_EDEFFECT_TOOLTIP;This slider selects the range of contrast values that will receive the full effect of any adjustment
 TP_WAVELET_EDGCONT;Local contrast
-TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
+TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+std. dev. and maxima.
 TP_WAVELET_EDGE;Edge Sharpness
 TP_WAVELET_EDGEAMPLI;Base amplification
 TP_WAVELET_EDGEDETECT;Gradient sensitivity
 TP_WAVELET_EDGEDETECTTHR;Threshold low (noise)
-TP_WAVELET_EDGEDETECTTHR2;Threshold high (detection)
-TP_WAVELET_EDGEDETECTTHR_TOOLTIP;This adjuster lets you target edge detection for example to avoid applying edge sharpness to fine details, such as noise in the sky.
+TP_WAVELET_EDGEDETECTTHR2;Edge enhancement
+TP_WAVELET_EDGEDETECTTHR_TOOLTIP;This slider sets a threshold below which finer details won't be considered as an edge
 TP_WAVELET_EDGEDETECT_TOOLTIP;Moving the slider to the right increases edge sensitivity. This affects local contrast, edge settings and noise.
 TP_WAVELET_EDGESENSI;Edge sensitivity
 TP_WAVELET_EDGREINF_TOOLTIP;Reinforce or reduce the action of the first level, do the opposite to the second level, and leave the rest unchanged.
 TP_WAVELET_EDGTHRESH;Detail
 TP_WAVELET_EDGTHRESH_TOOLTIP;Change the repartition between the first levels and the others. The higher the threshold the more the action is centered on the first levels. Be careful with negative values, they increase the action of high levels and can introduce artifacts.
 TP_WAVELET_EDRAD;Radius
-TP_WAVELET_EDRAD_TOOLTIP;This radius adjustment is very different from those in other sharpening tools. Its value is compared to each level through a complex function. In this sense, a value of zero still has an effect.
-TP_WAVELET_EDSL;Threshold Sliders
+TP_WAVELET_EDRAD_TOOLTIP;This adjustment controls the local enhancement. A value of zero still has an effect
+TP_WAVELET_EDSL;Threshold sliders
 TP_WAVELET_EDTYPE;Local contrast method
 TP_WAVELET_EDVAL;Strength
 TP_WAVELET_FINAL;Final Touchup
-TP_WAVELET_FINCFRAME;Final Local Contrast
+TP_WAVELET_FINCFRAME;Final local contrast
 TP_WAVELET_FINCOAR_TOOLTIP;The left (positive) part of the curve acts on the finer levels (increase).\nThe 2 points on the abscissa represent the respective action limits of finer and coarser levels 5 and 6 (default).\nThe right (negative) part of the curve acts on the coarser levels (increase).\nAvoid moving the left part of the curve with negative values. Avoid moving the right part of the curve with positives values
 TP_WAVELET_FINEST;Finest
 TP_WAVELET_HIGHLIGHT;Finer levels luminance range
@@ -3346,7 +3346,7 @@ TP_WAVELET_HS1;Whole luminance range
 TP_WAVELET_HS2;Selective luminance range
 TP_WAVELET_HUESKIN;Skin hue
 TP_WAVELET_HUESKIN_TOOLTIP;The bottom points set the beginning of the transition zone, and the upper points the end of it, where the effect is at its maximum.\n\nIf you need to move the area significantly, or if there are artifacts, then the <b>white balance is incorrect</b>.
-TP_WAVELET_HUESKY;Sky hue
+TP_WAVELET_HUESKY;Hue range
 TP_WAVELET_HUESKY_TOOLTIP;The bottom points set the beginning of the transition zone, and the upper points the end of it, where the effect is at its maximum.\n\nIf you need to move the area significantly, or if there are artifacts, then the <b>white balance is incorrect</b>.
 TP_WAVELET_ITER;Delta balance levels
 TP_WAVELET_ITER_TOOLTIP;Left: increase low levels and reduce high levels,\nRight: reduce low levels and increase high levels.
@@ -3354,18 +3354,18 @@ TP_WAVELET_LABEL;Wavelet Levels
 TP_WAVELET_LARGEST;Coarsest
 TP_WAVELET_LEVCH;Chroma
 TP_WAVELET_LEVDIR_ALL;All levels, in all directions
-TP_WAVELET_LEVDIR_INF;Finer details levels, with selected level
+TP_WAVELET_LEVDIR_INF;Finer detail levels, including selected level
 TP_WAVELET_LEVDIR_ONE;One level
-TP_WAVELET_LEVDIR_SUP;Coarser details levels, without selected level
+TP_WAVELET_LEVDIR_SUP;Coarser detail levels, excluding selected level
 TP_WAVELET_LEVELS;Wavelet levels
-TP_WAVELET_LEVELS_TOOLTIP;Choose the number of detail levels the image is to be decomposed into. More levels require more RAM and require a longer processing time.
+TP_WAVELET_LEVELS_TOOLTIP;Choose the number of wavelet decomposition levels for the image.\nMore levels require more RAM and require a longer processing time.
 TP_WAVELET_LEVF;Contrast
 TP_WAVELET_LEVLABEL;Preview maximum possible levels = %1
 TP_WAVELET_LEVONE;Level 2
 TP_WAVELET_LEVTHRE;Level 4
 TP_WAVELET_LEVTWO;Level 3
 TP_WAVELET_LEVZERO;Level 1
-TP_WAVELET_LINKEDG;Link with Edge Sharpness' Strength
+TP_WAVELET_LINKEDG;Link to Edge Sharpness Strength
 TP_WAVELET_LIPST;Enhanced algoritm
 TP_WAVELET_LOWLIGHT;Coarser levels luminance range
 TP_WAVELET_LOWTHR_TOOLTIP;Prevents amplification of fine textures and noise
@@ -3373,7 +3373,7 @@ TP_WAVELET_MEDGREINF;First level
 TP_WAVELET_MEDI;Reduce artifacts in blue sky
 TP_WAVELET_MEDILEV;Edge detection
 TP_WAVELET_MEDILEV_TOOLTIP;When you enable Edge Detection, it is recommanded:\n- to disabled low contrast levels to avoid artifacts,\n- to use high values of gradient sensitivity.\n\nYou can modulate the strength with 'refine' from Denoise and Refine.
-TP_WAVELET_MERGEC;Merge Chroma
+TP_WAVELET_MERGEC;Merge chroma
 TP_WAVELET_MERGEL;Merge Luma
 TP_WAVELET_NEUTRAL;Neutral
 TP_WAVELET_NOIS;Denoise
@@ -3384,24 +3384,24 @@ TP_WAVELET_NPLOW;Low
 TP_WAVELET_NPNONE;None
 TP_WAVELET_NPTYPE;Neighboring pixels
 TP_WAVELET_NPTYPE_TOOLTIP;This algorithm uses the proximity of a pixel and eight of its neighbors. If less difference, edges are reinforced.
-TP_WAVELET_OFFSET_TOOLTIP;Offset modifies the balance between shadows and highlights.\nHigh values here will amplify the contrast change of the highlights, whereas low values will amplify the contrast change of the shadows.\nAlong with a low Attenuation Response value you will able to select the contrasts that will be enhanced.
+TP_WAVELET_OFFSET_TOOLTIP;Offset modifies the balance between low contrast and high contrast details.\nHigh values will amplify contrast changes to the higher contrast details, whereas low values will amplify contrast changes to low contrast details.\nBy using a low Attenuation response value you can select which contrast values will be enhanced.
 TP_WAVELET_OLDSH;Algorithm using negatives values
-TP_WAVELET_OPACITY;Opacity Blue-Yellow
+TP_WAVELET_OPACITY;Opacity blue-yellow
 TP_WAVELET_OPACITYW;Contrast balance d/v-h curve
 TP_WAVELET_OPACITYWL;Local contrast
 TP_WAVELET_OPACITYWL_TOOLTIP;Modify the final local contrast at the end of the wavelet treatment.\n\nThe left side represents the smallest local contrast, progressing to the largest local contrast on the right.
 TP_WAVELET_PASTEL;Pastel chroma
 TP_WAVELET_PROC;Process
 TP_WAVELET_PROTAB;Protection
-TP_WAVELET_RADIUS;Radius Shadows - Highlight
+TP_WAVELET_RADIUS;Radius shadows - highlight
 TP_WAVELET_RANGEAB;Range a and b %
 TP_WAVELET_RE1;Reinforced
 TP_WAVELET_RE2;Unchanged
 TP_WAVELET_RE3;Reduced
-TP_WAVELET_RESBLUR;Blur Luminance
-TP_WAVELET_RESBLURC;Blur Chroma
+TP_WAVELET_RESBLUR;Blur luminance
+TP_WAVELET_RESBLURC;Blur chroma
 TP_WAVELET_RESBLUR_TOOLTIP;Disabled if zoom > about 500%
-TP_WAVELET_RESCHRO;Intensity
+TP_WAVELET_RESCHRO;Strength
 TP_WAVELET_RESCON;Shadows
 TP_WAVELET_RESCONH;Highlights
 TP_WAVELET_RESID;Residual Image
@@ -3410,14 +3410,14 @@ TP_WAVELET_SETTINGS;Wavelet Settings
 TP_WAVELET_SHA;Sharp mask
 TP_WAVELET_SHFRAME;Shadows/Highlights
 TP_WAVELET_SHOWMASK;Show wavelet 'mask'
-TP_WAVELET_SIGMA;Attenuation Response
-TP_WAVELET_SIGMAFIN;Attenuation Response
+TP_WAVELET_SIGMA;Attenuation response
+TP_WAVELET_SIGMAFIN;Attenuation response
 TP_WAVELET_SIGMA_TOOLTIP;The effect of the contrast sliders is stronger in medium contrast details, and weaker in high and low contrast details.\n With this slider you can control how quickly the effect dampens towards the extreme contrasts.\n The higher the slider is set, the wider the range of contrasts which will get a strong change, and the higher the risk to generate artifacts.\n .The lower it is, the more the effect will be pinpointed towards a narrow range of contrast values
 TP_WAVELET_SKIN;Skin targetting/protection
 TP_WAVELET_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 skin-tones are protected while all other tones are affected.
-TP_WAVELET_SKY;Sky targetting/protection
-TP_WAVELET_SKY_TOOLTIP;At -100 sky-tones are targetted.\nAt 0 all tones are treated equally.\nAt +100 sky-tones are protected while all other tones are affected.
-TP_WAVELET_SOFTRAD;Soft Radius
+TP_WAVELET_SKY;Hue targetting/protection
+TP_WAVELET_SKY_TOOLTIP;Allows you to target or protect a range of hues.\nAt -100 selected hues are targetted.\nAt 0 all hues are treated equally.\nAt +100 selected hues are protected while all other hues are targetted.
+TP_WAVELET_SOFTRAD;Soft radius
 TP_WAVELET_STREN;Strength
 TP_WAVELET_STRENGTH;Strength
 TP_WAVELET_SUPE;Extra
@@ -3426,7 +3426,7 @@ TP_WAVELET_THRESHOLD;Finer levels
 TP_WAVELET_THRESHOLD2;Coarser levels
 TP_WAVELET_THRESHOLD2_TOOLTIP;Only levels from the chosen value to the selected number of ‘wavelet levels’ will be affected by the Shadow luminance range.
 TP_WAVELET_THRESHOLD_TOOLTIP;Only levels below and including the chosen value will be affected by the Highlight luminance range. 
-TP_WAVELET_THRESWAV;Balance Threshold
+TP_WAVELET_THRESWAV;Balance threshold
 TP_WAVELET_THRH;Highlights threshold
 TP_WAVELET_TILESBIG;Tiles
 TP_WAVELET_TILESFULL;Full image
@@ -3439,11 +3439,11 @@ TP_WAVELET_TMSTRENGTH;Compression strength
 TP_WAVELET_TMSTRENGTH_TOOLTIP;Control the strength of tone mapping or contrast compression of the residual image.
 TP_WAVELET_TMTYPE;Compression method
 TP_WAVELET_TON;Toning
-TP_WAVELET_TONFRAME;Excluded Colors
+TP_WAVELET_TONFRAME;Excluded colors
 TP_WAVELET_USH;None
 TP_WAVELET_USHARP;Clarity method
 TP_WAVELET_USHARP_TOOLTIP;Origin : the source file is the file before Wavelet.\nWavelet : the source file is the file including wavelet threatment
-TP_WAVELET_USH_TOOLTIP;If you select Sharp-mask, wavelet settings will be automatically positioned :\nBackground=black, Process=below, level=3...you can change level between 1 and 4.\n\nIf you select Clarity, wavelet settings will be automatically positioned :\nBackground=residual, Process=above, level=7..you can change level between 5 and 10 and wavelet levels.
+TP_WAVELET_USH_TOOLTIP;If you select Sharp-mask, you can choose any level (in Settings) from 1 to 4 for processing.\nIf you select Clarity, you can choose any level (in Settings) between 5 and Extra.
 TP_WAVELET_WAVLOWTHR;Low contrast threshold
 TP_WAVELET_WAVOFFSET;Offset
 TP_WBALANCE_AUTO;Auto

From d939ffafdc88ad6e4e29b41a225e1d02a1327506 Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Wed, 5 Aug 2020 13:13:18 +0200
Subject: [PATCH 10/10] Change label strength refine

---
 rtdata/languages/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rtdata/languages/default b/rtdata/languages/default
index 97d5203da..db2bb7cc8 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -3419,7 +3419,7 @@ TP_WAVELET_SKIN_TOOLTIP;At -100 skin-tones are targetted.\nAt 0 all tones are tr
 TP_WAVELET_SKY;Hue targetting/protection
 TP_WAVELET_SKY_TOOLTIP;Allows you to target or protect a range of hues.\nAt -100 selected hues are targetted.\nAt 0 all hues are treated equally.\nAt +100 selected hues are protected while all other hues are targetted.
 TP_WAVELET_SOFTRAD;Soft radius
-TP_WAVELET_STREN;Strength
+TP_WAVELET_STREN;Refine
 TP_WAVELET_STRENGTH;Strength
 TP_WAVELET_SUPE;Extra
 TP_WAVELET_THR;Shadows threshold