Removed channel compensation adjusters

rtgui/paramsedited.cc

@@ -609,8 +609,6 @@ void ParamsEdited::set(bool v)
     filmNegative.greenExp = v;
     filmNegative.blueRatio = v;
     raw.preprocessWB.mode = v;
-    raw.preprocessWB.red = v;
-    raw.preprocessWB.blue = v;
 
     exif = v;
     iptc = v;
@@ -1199,8 +1197,6 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
         filmNegative.greenExp = filmNegative.greenExp && p.filmNegative.greenExp == other.filmNegative.greenExp;
         filmNegative.blueRatio = filmNegative.blueRatio && p.filmNegative.blueRatio == other.filmNegative.blueRatio;
         raw.preprocessWB.mode  = raw.preprocessWB.mode  && p.raw.preprocessWB.mode  == other.raw.preprocessWB.mode;
-        raw.preprocessWB.red   = raw.preprocessWB.red   && p.raw.preprocessWB.red   == other.raw.preprocessWB.red;
-        raw.preprocessWB.blue  = raw.preprocessWB.blue  && p.raw.preprocessWB.blue  == other.raw.preprocessWB.blue;
 
 //      How the hell can we handle that???
 //      exif = exif && p.exif==other.exif
@@ -3350,14 +3346,6 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
         toEdit.raw.preprocessWB.mode = mods.raw.preprocessWB.mode;
     }
 
-    if (raw.preprocessWB.red) {
-        toEdit.raw.preprocessWB.red = mods.raw.preprocessWB.red;
-    }
-
-    if (raw.preprocessWB.blue) {
-        toEdit.raw.preprocessWB.blue = mods.raw.preprocessWB.blue;
-    }
-
     // Exif changes are added to the existing ones
     if (exif) {
         for (procparams::ExifPairs::const_iterator i = mods.exif.begin(); i != mods.exif.end(); ++i) {
@@ -3414,5 +3402,5 @@ bool CaptureSharpeningParamsEdited::isUnchanged() const
 
 bool RAWParamsEdited::PreprocessWBParamsEdited::isUnchanged() const
 {
-    return mode && red && blue;
+    return mode;
 }

rtgui/paramsedited.h

@@ -701,8 +701,6 @@ struct RAWParamsEdited {
 
     struct PreprocessWBParamsEdited {
         bool mode;
-        bool red;
-        bool blue;
 
         bool isUnchanged() const;
     };

rtgui/partialpastedlg.cc

@@ -1008,8 +1008,6 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
 
     if (!raw_preprocwb->get_active ()) {
         filterPE.raw.preprocessWB.mode    = falsePE.raw.preprocessWB.mode;
-        filterPE.raw.preprocessWB.red     = falsePE.raw.preprocessWB.red;
-        filterPE.raw.preprocessWB.blue    = falsePE.raw.preprocessWB.blue;
     }
 
     if (dstPE) {

rtgui/preprocesswb.cc

@@ -32,10 +32,7 @@ using namespace rtengine::procparams;
 PreprocessWB::PreprocessWB() :
     FoldableToolPanel(this, "preprocesswb", M("TP_PREPROCWB_LABEL")),
     evPreprocessWBMode(ProcEventMapper::getInstance()->newEvent(FIRST, "HISTORY_MSG_PREPROCWB_MODE")),
-    evPreprocessWBMults(ProcEventMapper::getInstance()->newEvent(FIRST, "HISTORY_MSG_PREPROCWB_MULTS")),
-    mode(Gtk::manage(new MyComboBoxText())),
-    red(Gtk::manage(new Adjuster(M("TP_PREPROCWB_RED"), 0.05, 20.0, 0.01, 1))),
-    blue(Gtk::manage(new Adjuster(M("TP_PREPROCWB_BLUE"), 0.05, 20.0, 0.01, 1)))
+    mode(Gtk::manage(new MyComboBoxText()))
 {
     Gtk::HBox *hb = Gtk::manage(new Gtk::HBox());
     hb->pack_start(*Gtk::manage(new Gtk::Label(M("TP_PREPROCWB_MODE") + ": ")), Gtk::PACK_SHRINK, 0);
@@ -48,41 +45,16 @@ PreprocessWB::PreprocessWB() :
     mode->set_active(0);
     mode->signal_changed().connect(sigc::mem_fun(*this, &PreprocessWB::modeChanged));
 
-    red->setAdjusterListener(this);
-    blue->setAdjusterListener(this);
-
-    red->setLogScale(8, 1, true);
-    blue->setLogScale(8, 1, true);
-
-    if (red->delay < options.adjusterMaxDelay) {
-        red->delay = options.adjusterMaxDelay;
-    }
-
-    if (blue->delay < options.adjusterMaxDelay) {
-        blue->delay = options.adjusterMaxDelay;
-    }
-
     mode->show();
-    red->show();
-    blue->show();
 
     pack_start(*hb, Gtk::PACK_SHRINK, 4);
-    pack_start(*red, Gtk::PACK_SHRINK, 4);
-    pack_start(*blue, Gtk::PACK_SHRINK, 4);
 }
 
 void PreprocessWB::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited)
 {
     disableListener();
 
-    if (pedited) {
-        red->setEditedState(pedited->raw.preprocessWB.red ? Edited : UnEdited);
-        blue->setEditedState(pedited->raw.preprocessWB.blue ? Edited : UnEdited);
-    }
-
     mode->set_active(int(pp->raw.preprocessWB.mode));
-    red->setValue(pp->raw.preprocessWB.red);
-    blue->setValue(pp->raw.preprocessWB.blue);
 
     enableListener();
 }
@@ -93,25 +65,12 @@ void PreprocessWB::write(rtengine::procparams::ProcParams* pp, ParamsEdited* ped
         pp->raw.preprocessWB.mode = RAWParams::PreprocessWB::Mode(mode->get_active_row_number());
     }
 
-    pp->raw.preprocessWB.red = red->getValue();
-    pp->raw.preprocessWB.blue = blue->getValue();
-
     if (pedited) {
         pedited->raw.preprocessWB.mode = mode->get_active_row_number() != 2; // UNCHANGED entry, see setBatchMode
-        pedited->raw.preprocessWB.red = red->getEditedState();
-        pedited->raw.preprocessWB.blue = blue->getEditedState();
     }
 
 }
 
-void PreprocessWB::adjusterChanged(Adjuster* a, double newval)
-{
-    if (listener) {
-        listener->panelChanged(evPreprocessWBMults,  Glib::ustring::compose(
-                                   "R/G=%1 ; B/G=%2", red->getValue(), blue->getValue()));
-    }
-}
-
 void PreprocessWB::setBatchMode(bool batchMode)
 {
     ToolPanel::setBatchMode(batchMode);
@@ -119,35 +78,15 @@ void PreprocessWB::setBatchMode(bool batchMode)
     if (batchMode) {
         mode->append(M("GENERAL_UNCHANGED"));
         mode->set_active_text(M("GENERAL_UNCHANGED"));
-        red->showEditedCB();
-        blue->showEditedCB();
     }
 }
 
 void PreprocessWB::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited)
 {
-    red->setDefault(defParams->raw.preprocessWB.red);
-    blue->setDefault(defParams->raw.preprocessWB.blue);
-
-    if (pedited) {
-        red->setDefaultEditedState(pedited->raw.preprocessWB.red ? Edited : UnEdited);
-        blue->setDefaultEditedState(pedited->raw.preprocessWB.blue ? Edited : UnEdited);
-    } else {
-        red->setDefaultEditedState(Irrelevant);
-        blue->setDefaultEditedState(Irrelevant);
-    }
-}
-
-void PreprocessWB::setAdjusterBehavior(bool add)
-{
-    red->setAddMode(add);
-    blue->setAddMode(add);
 }
 
 void PreprocessWB::trimValues(rtengine::procparams::ProcParams* pp)
 {
-    red->trimValue(pp->raw.preprocessWB.red);
-    blue->trimValue(pp->raw.preprocessWB.blue);
 }
 
 void PreprocessWB::modeChanged()

rtgui/preprocesswb.h

@@ -25,18 +25,14 @@
 
 class PreprocessWB final:
     public ToolParamBlock,
-    public AdjusterListener,
     public FoldableToolPanel
 {
 
 private:
-    const rtengine::ProcEvent evPreprocessWBMode, evPreprocessWBMults;
+    const rtengine::ProcEvent evPreprocessWBMode;
 
     MyComboBoxText* mode;
 
-    Adjuster* red;
-    Adjuster* blue;
-
 public:
 
     PreprocessWB();
@@ -45,7 +41,6 @@ public:
     void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
     void setBatchMode(bool batchMode) override;
     void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
-    void adjusterChanged(Adjuster* a, double newval) override;
     void setAdjusterBehavior(bool add);
     void trimValues(rtengine::procparams::ProcParams* pp) override;
     void modeChanged();