Merge with 'Beep6581/dev'

rtgui/whitebalance.h

@@ -46,6 +46,8 @@ class WhiteBalance final : public ToolParamBlock, public AdjusterListener, publi
 
 private:
     Gtk::Label*  StudLabel;
+    Gtk::Label*  PatchLabel;
+    Gtk::Label*  PatchlevelLabel;
     Gtk::Label*  mulLabel;
 
 protected:
@@ -64,6 +66,9 @@ protected:
     };
     
     rtengine::ProcEvent EvWBObserver10;
+    rtengine::ProcEvent EvWBitcwbprim;
+    rtengine::ProcEvent EvWBitcwbalg;
+    rtengine::ProcEvent EvWBitcwgreen;
 
     Glib::ustring wbIcons[rtengine::toUnderlying(rtengine::procparams::WBEntry::Type::CUSTOM) + 1];
     Glib::RefPtr<Gtk::TreeStore> refTreeModel;
@@ -76,6 +81,12 @@ protected:
     Adjuster* equal;
     Adjuster* tempBias;
     CheckBox* observer10;
+    Gtk::Frame* itcwbFrame;
+    Gtk::CheckButton* itcwb_alg;
+    MyComboBoxText* itcwb_prim;
+    Adjuster* itcwb_green;
+    
+    bool lastitcwb_alg;
 
     Gtk::Button* spotbutton;
     int opt;
@@ -83,7 +94,7 @@ protected:
     double nextGreen;
     WBProvider *wbp;  // pointer to a ToolPanelCoordinator object, or its subclass BatchToolPanelCoordinator
     SpotWBListener* wblistener;
-    sigc::connection methconn;
+    sigc::connection methconn, itcwb_algconn, itcwb_primconn;
     int custom_temp;
     double custom_green;
     double custom_equal;
@@ -129,8 +140,9 @@ public:
     }
     void setWB (int temp, double green);
     void resetWB ();
-    void WBChanged           (double temp, double green, double rw, double gw, double bw, float studgood) override;
-
+    void WBChanged           (int met, double temp, double green, double rw, double gw, double bw, float temp0, float delta, int bia, int dread, float studgood, float minchrom, int kmin, float histmin, float histmax) override;
+    void itcwb_alg_toggled ();
+    void itcwb_prim_changed ();
     void setAdjusterBehavior (bool tempadd, bool greenadd, bool equaladd, bool tempbiasadd);
     void trimValues          (rtengine::procparams::ProcParams* pp) override;
     void enabledChanged() override;