Merge branch 'newlocallab2' of https://github.com/Beep6581/RawTherapee into newlocallab2

rtdata/languages/default

@@ -2743,7 +2743,7 @@ TP_LOCALLAB_STRGRID;Strength
 TP_LOCALLAB_STRRETI_TOOLTIP;if Strength Retinex < 0.2 only Dehaze is enabled.\nif Strength Retinex >= 0.1 Dehaze is in luminance mode.
 TP_LOCALLAB_STRUC;Structure
 TP_LOCALLAB_STRUCCOL1;Structure Spot
-TP_LOCALLAB_STRUCT_TOOLTIP;Use Sobel algorithm to take into account structure in shape detection.\nyou can have a preview by activating "mask and modifications - Show structure spot".\n\nCan be used in conjunction with masks (expert) structure, blur, wavelet to improve edge detection
+TP_LOCALLAB_STRUCT_TOOLTIP;Use Sobel algorithm to take into account structure in shape detection.\nyou can have a preview by activating "mask and modifications - Show structure spot".\n\nCan be used in conjunction with masks (expert) structure, blur, wavelet to improve edge detection.\n\nNeeds maskless adjustments to be activated (lightness, exposure...)
 TP_LOCALLAB_STRUCCOL;Structure
 TP_LOCALLAB_STRUMASKCOL;Structure mask strength
 TP_LOCALLAB_STRUMASK_TOOLTIP;Generate a structure mask with difference between surface areas and reliefs.\nIf structure mask as tool is enabled, this mask is used in addition to the other tools (gamma, slope, contrast curve ...)

rtengine/procparams.cc

@@ -2716,7 +2716,7 @@ LocallabParams::LocallabSpot::LocallabSpot() :
     special(false),
     toolcol(true),
     enaColorMask(false),
-    fftColorMask(false),
+    fftColorMask(true),
     CCmaskcurve{
         static_cast<double>(FCT_MinMaxCPoints),
         0.0,
@@ -5207,6 +5207,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
                     saveToKeyfile(!pedited || spot_edited->strcolh, "Locallab", "Strcolh_" + index_str, spot.strcolh, keyFile);
                     saveToKeyfile(!pedited || spot_edited->angcol, "Locallab", "Angcol_" + index_str, spot.angcol, keyFile);
                     saveToKeyfile(!pedited || spot_edited->blurcolde, "Locallab", "Blurcolde_" + index_str, spot.blurcolde, keyFile);
+                    saveToKeyfile(!pedited || spot_edited->blurcol, "Locallab", "Blurcol_" + index_str, spot.blurcol, keyFile);
                     saveToKeyfile(!pedited || spot_edited->contcol, "Locallab", "Contcol_" + index_str, spot.contcol, keyFile);
                     saveToKeyfile(!pedited || spot_edited->blendmaskcol, "Locallab", "Blendmaskcol_" + index_str, spot.blendmaskcol, keyFile);
                     saveToKeyfile(!pedited || spot_edited->radmaskcol, "Locallab", "Radmaskcol_" + index_str, spot.radmaskcol, keyFile);

rtgui/locallabtools.cc

@@ -1121,6 +1121,9 @@ void LocallabColor::read(const rtengine::procparams::ProcParams* pp, const Param
         toolcol->set_active(spot.toolcol);
         fftColorMask->set_active(spot.fftColorMask);
         contcol->setValue(spot.contcol);
+        // Update GUI according to fftColorMash button state
+        // Note: Contrary to the others, shall be called before setting 'blurcol' value
+        updateColorGUI3();
         blurcol->setValue(spot.blurcol);
         blendmaskcol->setValue(spot.blendmaskcol);
         radmaskcol->setValue(spot.radmaskcol);
@@ -1147,9 +1150,6 @@ void LocallabColor::read(const rtengine::procparams::ProcParams* pp, const Param
     // Update GUI according to merMethod combobox state
     updateColorGUI2();
 
-    // Update GUI according to fftColorMash button state
-    updateColorGUI3();
-
     // Note: No need to manage pedited as batch mode is deactivated for Locallab
 }
 

rtgui/locallabtools2.cc

@@ -2668,6 +2668,10 @@ void LocallabContrast::read(const rtengine::procparams::ProcParams* pp, const Pa
             localcontMethod->set_active(1);
         }
 
+        fftwlc->set_active(spot.fftwlc);
+        // Update Local contrast GUI according to fftwlc button state
+        // Note: Contrary to the others, shall be called before setting 'lcradius' value
+        updateContrastGUI3();
         lcradius->setValue((double)spot.lcradius);
         lcamount->setValue(spot.lcamount);
         lcdarkness->setValue(spot.lcdarkness);
@@ -2743,7 +2747,6 @@ void LocallabContrast::read(const rtengine::procparams::ProcParams* pp, const Pa
         deltad->setValue(spot.deltad);
         wavshapecomp->setCurve(spot.loccompwavcurve);
         fatres->setValue(spot.fatres);
-        fftwlc->set_active(spot.fftwlc);
         enalcMask->set_active(spot.enalcMask);
         CCmasklcshape->setCurve(spot.CCmasklccurve);
         LLmasklcshape->setCurve(spot.LLmasklccurve);
@@ -2766,9 +2769,6 @@ void LocallabContrast::read(const rtengine::procparams::ProcParams* pp, const Pa
     // Update Local contrast GUI according to waveshow button state
     updateContrastGUI2();
 
-    // Update Local contrast GUI according to fftwlc button state
-    updateContrastGUI3();
-
     // Note: No need to manage pedited as batch mode is deactivated for Locallab
 }