From 90343fe82f4d1dca3eb9bd526aaacf29b6de3ca3 Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Tue, 7 Jul 2020 18:09:26 +0200
Subject: [PATCH] Simplify in normal color Light and exposure with slider
 structure

---
 rtdata/languages/Francais |  4 ++--
 rtdata/languages/default  |  4 ++--
 rtgui/locallabtools.cc    | 12 ++++++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index b85a969b1..1d79c7628 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -2212,8 +2212,8 @@ TP_LOCALLAB_SHOWPOISSON;Poisson (pde ƒ)
 TP_LOCALLAB_SHOWR;Masque et modifications
 TP_LOCALLAB_SHOWREF;Prévisualisation ΔE
 TP_LOCALLAB_SHOWS;Masque et modifications
-TP_LOCALLAB_SHOWSTRUC;Montrer Spot structure
-TP_LOCALLAB_SHOWSTRUCEX;Montrer Spot structure
+TP_LOCALLAB_SHOWSTRUC;Montrer Spot structure (expert)
+TP_LOCALLAB_SHOWSTRUCEX;Montrer Spot structure (expert)
 TP_LOCALLAB_SHOWT;Masque et modifications
 TP_LOCALLAB_SHOWVI;Masque et modifications
 TP_LOCALLAB_SHRESFRA;Ombres/Lumières
diff --git a/rtdata/languages/default b/rtdata/languages/default
index dea86eba4..84128387f 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -2790,8 +2790,8 @@ TP_LOCALLAB_SHOWPOISSON;Poisson (pde ƒ)
 TP_LOCALLAB_SHOWR;Mask and modifications
 TP_LOCALLAB_SHOWREF;Preview ΔE
 TP_LOCALLAB_SHOWS;Mask and modifications
-TP_LOCALLAB_SHOWSTRUC;Show structure Spot
-TP_LOCALLAB_SHOWSTRUCEX;Show structure Spot
+TP_LOCALLAB_SHOWSTRUC;Show structure Spot(expert)
+TP_LOCALLAB_SHOWSTRUCEX;Show structure Spot(expert)
 TP_LOCALLAB_SHOWT;Mask and modifications
 TP_LOCALLAB_SHOWVI;Mask and modifications
 TP_LOCALLAB_SHRESFRA;Shadows/Highlights
diff --git a/rtgui/locallabtools.cc b/rtgui/locallabtools.cc
index 49b6feb56..5310a2d2f 100644
--- a/rtgui/locallabtools.cc
+++ b/rtgui/locallabtools.cc
@@ -1680,6 +1680,7 @@ void LocallabColor::convertParamToNormal()
 
     // Set hidden GUI widgets in Normal mode to default spot values
     blurcolde->setValue((double)defSpot.blurcolde);
+    structcol->setValue((double)defSpot.structcol);
   //  softradiuscol->setValue(defSpot.softradiuscol);
     strcolab->setValue(defSpot.strcolab);
     strcolh->setValue(defSpot.strcolh);
@@ -1811,9 +1812,11 @@ void LocallabColor::updateGUIToMode(const modeType new_type)
         maskHCurveEditorG->hide();
         mask2CurveEditorGwav->hide();
         csThresholdcol->hide();
+        structcol->hide();
     } else {
         // Advanced widgets are shown in Expert mode
         blurcolde->show();
+        structcol->show();
 
         if (!invers->get_active()) { // Keep widget hidden when invers is toggled
             softradiuscol->show();
@@ -2077,6 +2080,7 @@ void LocallabColor::updateColorGUI1()
 
         if (mode == Normal) { // Keep widget hidden in Normal mode
             softradiuscol->show();
+            structcol->hide();
         }
 
         expgradcol->show();
@@ -3012,6 +3016,8 @@ void LocallabExposure::convertParamToNormal()
     slomaskexp->setValue(defSpot.slomaskexp);
     strmaskexp->setValue(defSpot.strmaskexp);
     angmaskexp->setValue(defSpot.angmaskexp);
+    structexp->setValue((double)defSpot.structexp);
+
  //   laplacexp->setValue(defSpot.laplacexp);
   //  linear->setValue(defSpot.linear);
   //  balanexp->setValue(defSpot.balanexp);
@@ -3030,6 +3036,7 @@ void LocallabExposure::updateGUIToMode(const modeType new_type)
         slomaskexp->hide();
         gradFramemask->hide();
         blurexpde->hide();
+        structexp->hide();
      //   pdeFrame->hide();
     } else {
         // Advanced widgets are shown in Expert mode
@@ -3038,6 +3045,7 @@ void LocallabExposure::updateGUIToMode(const modeType new_type)
         slomaskexp->show();
         gradFramemask->show();
         blurexpde->show();
+        structexp->show();
       //  pdeFrame->show();
     }
 }
@@ -3210,7 +3218,7 @@ void LocallabExposure::updateExposureGUI3()
             updateExposureGUI2();
         }
 
-        structexp->hide();
+        //structexp->hide();
        // shadex->hide();
         shadex->show();
         softradiusexp->hide();
@@ -3223,7 +3231,7 @@ void LocallabExposure::updateExposureGUI3()
         showmaskexpMethodinv->show();
     } else {
         expMethod->show();
-        structexp->show();
+        //structexp->show();
         shadex->show();
         softradiusexp->show();
         expgradexp->show();