From 2062555e47965f729dde07418abab540880d7561 Mon Sep 17 00:00:00 2001
From: heckflosse <heckflosse67@gmx.de>
Date: Tue, 11 Sep 2018 23:43:39 +0200
Subject: [PATCH] remove raw ca correction 'avoid colour shift' from gui, #4777

---
 rtgui/rawcacorrection.cc | 25 +++++++++++++------------
 rtgui/rawcacorrection.h  |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/rtgui/rawcacorrection.cc b/rtgui/rawcacorrection.cc
index dc5657ece..5ad5d30a3 100644
--- a/rtgui/rawcacorrection.cc
+++ b/rtgui/rawcacorrection.cc
@@ -39,7 +39,7 @@ RAWCACorr::RAWCACorr () : FoldableToolPanel(this, "rawcacorrection", M("TP_CHROM
     caAutocorrect = Gtk::manage (new CheckBox(M("TP_RAWCACORR_AUTO"), multiImage));
     caAutocorrect->setCheckBoxListener (this);
 
-    caAutoiterations = Gtk::manage(new Adjuster (M("TP_RAWCACORR_AUTOIT"), 1, 10, 1, 2));
+    caAutoiterations = Gtk::manage(new Adjuster (M("TP_RAWCACORR_AUTOIT"), 1, 5, 1, 2));
     caAutoiterations->setAdjusterListener (this);
 
     if (caAutoiterations->delay < options.adjusterMaxDelay) {
@@ -68,9 +68,9 @@ RAWCACorr::RAWCACorr () : FoldableToolPanel(this, "rawcacorrection", M("TP_CHROM
     pack_start( *caRed, Gtk::PACK_SHRINK, 4);
     pack_start( *caBlue, Gtk::PACK_SHRINK, 4);
 
-    caAvoidcolourshift = Gtk::manage (new CheckBox(M("TP_RAWCACORR_AVOIDCOLORSHIFT"), multiImage));
-    caAvoidcolourshift->setCheckBoxListener (this);
-    pack_start( *caAvoidcolourshift, Gtk::PACK_SHRINK, 4);
+//    caAvoidcolourshift = Gtk::manage (new CheckBox(M("TP_RAWCACORR_AVOIDCOLORSHIFT"), multiImage));
+//    caAvoidcolourshift->setCheckBoxListener (this);
+//    pack_start( *caAvoidcolourshift, Gtk::PACK_SHRINK, 4);
 
 
 }
@@ -81,7 +81,7 @@ void RAWCACorr::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
 
     if(pedited ) {
         caAutocorrect->setEdited(pedited->raw.ca_autocorrect);
-        caAvoidcolourshift->setEdited(pedited->raw.ca_avoidcolourshift);
+//        caAvoidcolourshift->setEdited(pedited->raw.ca_avoidcolourshift);
         caAutoiterations->setEditedState( pedited->raw.caautoiterations ? Edited : UnEdited );
         caRed->setEditedState( pedited->raw.cared ? Edited : UnEdited );
         caBlue->setEditedState( pedited->raw.cablue ? Edited : UnEdited );
@@ -93,7 +93,7 @@ void RAWCACorr::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
     caBlue->set_sensitive(!pp->raw.ca_autocorrect);
 
     caAutocorrect->setValue(pp->raw.ca_autocorrect);
-    caAvoidcolourshift->setValue(pp->raw.ca_avoidcolourshift);
+//    caAvoidcolourshift->setValue(pp->raw.ca_avoidcolourshift);
     caAutoiterations->setValue (pp->raw.caautoiterations);
     caRed->setValue (pp->raw.cared);
     caBlue->setValue (pp->raw.cablue);
@@ -104,14 +104,14 @@ void RAWCACorr::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
 void RAWCACorr::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
 {
     pp->raw.ca_autocorrect = caAutocorrect->getLastActive();
-    pp->raw.ca_avoidcolourshift = caAvoidcolourshift->getLastActive();
+//    pp->raw.ca_avoidcolourshift = caAvoidcolourshift->getLastActive();
     pp->raw.caautoiterations = caAutoiterations->getValue();
     pp->raw.cared = caRed->getValue();
     pp->raw.cablue = caBlue->getValue();
 
     if (pedited) {
         pedited->raw.ca_autocorrect = !caAutocorrect->get_inconsistent();
-        pedited->raw.ca_avoidcolourshift = !caAvoidcolourshift->get_inconsistent();
+//        pedited->raw.ca_avoidcolourshift = !caAvoidcolourshift->get_inconsistent();
         pedited->raw.caautoiterations = caAutoiterations->getEditedState ();
         pedited->raw.cared = caRed->getEditedState ();
         pedited->raw.cablue = caBlue->getEditedState ();
@@ -147,11 +147,12 @@ void RAWCACorr::checkBoxToggled (CheckBox* c, CheckValue newval)
         if (listener) {
             listener->panelChanged (EvPreProcessAutoCA, caAutocorrect->getLastActive() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
         }
-    } else if (c == caAvoidcolourshift) {
-        if (listener) {
-            listener->panelChanged ((caAutocorrect->getLastActive() || caRed->getValue() != 0 || caBlue->getValue() != 0) ? EvPreProcessCAColourshift : EvPreProcessCAColourshiftHistory, caAvoidcolourshift->getLastActive() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
-        }
     }
+//     else if (c == caAvoidcolourshift) {
+//        if (listener) {
+//            listener->panelChanged ((caAutocorrect->getLastActive() || caRed->getValue() != 0 || caBlue->getValue() != 0) ? EvPreProcessCAColourshift : EvPreProcessCAColourshiftHistory, caAvoidcolourshift->getLastActive() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
+//        }
+//    }
 }
 
 void RAWCACorr::setBatchMode(bool batchMode)
diff --git a/rtgui/rawcacorrection.h b/rtgui/rawcacorrection.h
index dea9ef738..1c1ced53b 100644
--- a/rtgui/rawcacorrection.h
+++ b/rtgui/rawcacorrection.h
@@ -32,7 +32,7 @@ protected:
     Adjuster* caAutoiterations;
     Adjuster* caRed;
     Adjuster* caBlue;
-    CheckBox* caAvoidcolourshift;
+//    CheckBox* caAvoidcolourshift;
 
     rtengine::ProcEvent EvPreProcessCAAutoiterations;
     rtengine::ProcEvent EvPreProcessCAColourshift;