Fix autowb issues, fixes #3690

This commit is contained in:
heckflosse
2017-02-15 01:30:41 +01:00
parent 6b6c08028d
commit 54d1533a7d
6 changed files with 30 additions and 2 deletions

View File

@@ -488,6 +488,7 @@ void ToolPanelCoordinator::initImage (rtengine::StagedImageProcessor* ipc_, bool
ipc->setAutoExpListener (toneCurve);
ipc->setAutoCamListener (colorappearance);
ipc->setAutoBWListener (blackwhite);
ipc->setAutoWBListener (whitebalance);
ipc->setAutoColorTonListener (colortoning);
ipc->setAutoChromaListener (dirpyrdenoise);
ipc->setWaveletListener (wavelet);

View File

@@ -884,3 +884,11 @@ inline Gtk::TreeRow WhiteBalance::getActiveMethod ()
{
return *(method->get_active());
}
void WhiteBalance::WBChanged(double temperature, double greenVal)
{
disableListener();
temp->setValue(temperature);
green->setValue(greenVal);
enableListener();
}

View File

@@ -34,7 +34,7 @@ public:
virtual void spotWBRequested (int size) {}
};
class WhiteBalance : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
class WhiteBalance : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public rtengine::AutoWBListener
{
enum WB_LabelType {
@@ -114,6 +114,7 @@ public:
wblistener = l;
}
void setWB (int temp, double green);
void WBChanged (double temp, double green);
void setAdjusterBehavior (bool tempadd, bool greenadd, bool equaladd);
void trimValues (rtengine::procparams::ProcParams* pp);