merged branch 'colortab-tools-onoff' into 'dev'

rtgui/labcurve.cc

@@ -24,7 +24,7 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-LCurve::LCurve () : FoldableToolPanel(this, "labcurves", M("TP_LABCURVE_LABEL"))
+LCurve::LCurve () : FoldableToolPanel(this, "labcurves", M("TP_LABCURVE_LABEL"), false, true)
 {
 
     std::vector<GradientMilestone> milestones;
@@ -244,6 +244,8 @@ void LCurve::read (const ProcParams* pp, const ParamsEdited* pedited)
         hhshape->setUnChanged  (!pedited->labCurve.hhcurve);
         lcshape->setUnChanged  (!pedited->labCurve.lccurve);
         clshape->setUnChanged  (!pedited->labCurve.clcurve);
+
+        set_inconsistent(multiImage && !pedited->labCurve.enabled);
     }
 
     brightness->setValue    (pp->labCurve.brightness);
@@ -277,6 +279,8 @@ void LCurve::read (const ProcParams* pp, const ParamsEdited* pedited)
     lcshape->setCurve  (pp->labCurve.lccurve);
     clshape->setCurve  (pp->labCurve.clcurve);
 
+    setEnabled(pp->labCurve.enabled);
+    
     queue_draw();
 
     enableListener ();
@@ -338,7 +342,8 @@ void LCurve::setEditProvider  (EditDataProvider *provider)
 
 void LCurve::write (ProcParams* pp, ParamsEdited* pedited)
 {
-
+    pp->labCurve.enabled = getEnabled();
+    
     pp->labCurve.brightness    = brightness->getValue ();
     pp->labCurve.contrast      = (int)contrast->getValue ();
     pp->labCurve.chromaticity  = (int)chromaticity->getValue ();
@@ -380,7 +385,7 @@ void LCurve::write (ProcParams* pp, ParamsEdited* pedited)
         pedited->labCurve.lccurve   = !lcshape->isUnChanged ();
         pedited->labCurve.clcurve   = !clshape->isUnChanged ();
 
-
+        pedited->labCurve.enabled = !get_inconsistent();
     }
 
 }
@@ -424,7 +429,7 @@ void LCurve::avoidcolorshift_toggled ()
         lastACVal = avoidcolorshift->get_active ();
     }
 
-    if (listener) {
+    if (listener && getEnabled()) {
         if (avoidcolorshift->get_active ()) {
             listener->panelChanged (EvLAvoidColorShift, M("GENERAL_ENABLED"));
         } else {
@@ -451,7 +456,7 @@ void LCurve::lcredsk_toggled ()
         lcshape->refresh();
     }
 
-    if (listener) {
+    if (listener && getEnabled()) {
         if (lcredsk->get_active ()) {
             listener->panelChanged (EvLLCredsk, M("GENERAL_ENABLED"));
         } else {
@@ -471,7 +476,7 @@ void LCurve::lcredsk_toggled ()
 void LCurve::curveChanged (CurveEditor* ce)
 {
 
-    if (listener) {
+    if (listener && getEnabled()) {
         if (ce == lshape) {
             listener->panelChanged (EvLLCurve, M("HISTORY_CUSTOMCURVE"));
         }
@@ -526,15 +531,15 @@ void LCurve::adjusterChanged (Adjuster* a, double newval)
     }
 
     if (a == brightness) {
-        if (listener) {
+        if (listener && getEnabled()) {
             listener->panelChanged (EvLBrightness, costr);
         }
     } else if (a == contrast) {
-        if (listener) {
+        if (listener && getEnabled()) {
             listener->panelChanged (EvLContrast, costr);
         }
     } else if (a == rstprotection) {
-        if (listener) {
+        if (listener && getEnabled()) {
             listener->panelChanged (EvLRSTProtection, costr);
         }
     } else if (a == chromaticity) {
@@ -550,7 +555,7 @@ void LCurve::adjusterChanged (Adjuster* a, double newval)
             lcredsk->set_sensitive( int(newval) > -100 );
         }
 
-        if (listener) {
+        if (listener && getEnabled()) {
             listener->panelChanged (EvLSaturation, costr);
         }
     }
@@ -668,3 +673,16 @@ void LCurve::trimValues (rtengine::procparams::ProcParams* pp)
     contrast->trimValue(pp->labCurve.contrast);
     chromaticity->trimValue(pp->labCurve.chromaticity);
 }
+
+void LCurve::enabledChanged()
+{
+    if (listener) {
+        if (get_inconsistent()) {
+            listener->panelChanged (EvLEnabled, M("GENERAL_UNCHANGED"));
+        } else if (getEnabled()) {
+            listener->panelChanged (EvLEnabled, M("GENERAL_ENABLED"));
+        } else {
+            listener->panelChanged (EvLEnabled, M("GENERAL_DISABLED"));
+        }
+    }
+}

rtgui/labcurve.h

@@ -82,10 +82,7 @@ public:
 
     virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller);
 
-private:
-
-
-
+    void enabledChanged();
 };
 
 #endif

rtgui/paramsedited.cc

@@ -82,6 +82,7 @@ void ParamsEdited::set (bool v)
     retinex.radius        = v;
 
     retinex.retinex = v;
+    labCurve.enabled = v;
     labCurve.lcurve      = v;
     labCurve.acurve      = v;
     labCurve.bcurve      = v;
@@ -626,6 +627,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
         retinex.radius = retinex.radius && p.retinex.radius == other.retinex.radius;
 
         retinex.enabled = retinex.enabled && p.retinex.enabled == other.retinex.enabled;
+        labCurve.enabled = labCurve.enabled && p.labCurve.enabled == other.labCurve.enabled;
         labCurve.lcurve = labCurve.lcurve && p.labCurve.lcurve == other.labCurve.lcurve;
         labCurve.acurve = labCurve.acurve && p.labCurve.acurve == other.labCurve.acurve;
         labCurve.bcurve = labCurve.bcurve && p.labCurve.bcurve == other.labCurve.bcurve;
@@ -1304,6 +1306,10 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
     }
 
 
+    if (labCurve.enabled) {
+        toEdit.labCurve.enabled = mods.labCurve.enabled;
+    }
+    
     if (labCurve.lcurve) {
         toEdit.labCurve.lcurve        = mods.labCurve.lcurve;
     }

rtgui/paramsedited.h

@@ -100,6 +100,7 @@ public:
 class LCurveParamsEdited
 {
 public:
+    bool enabled;
     bool brightness;
     bool contrast;
     bool chromaticity;
@@ -115,8 +116,6 @@ public:
     bool hhcurve;
     bool lccurve;
     bool clcurve;
-    bool enabled;
-    bool method;
 };
 
 class RGBCurvesParamsEdited