diff --git a/rtgui/locallabtools.cc b/rtgui/locallabtools.cc index f40f892a1..e6c671636 100644 --- a/rtgui/locallabtools.cc +++ b/rtgui/locallabtools.cc @@ -447,7 +447,7 @@ LocallabColor::LocallabColor(): blurFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_LABBLURM")))), fftColorMask(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_FFTCOL_MASK")))), contcol(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CONTCOL"), 0., 200., 0.5, 0.))), - blurcol(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BLURCOL"), 0.2, 200., 0.5, 0.2))), + blurcol(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BLURCOL"), 0.2, 100., 0.5, 0.2))), blendmaskcol(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BLENDMASKCOL"), -100, 100, 1, 0))), radmaskcol(Gtk::manage(new Adjuster(M("TP_LOCALLAB_RADMASKCOL"), -10.0, 1000.0, 0.1, 0.))), lapmaskcol(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LAPMASKCOL"), 0.0, 100.0, 0.1, 0.))), @@ -1121,6 +1121,9 @@ void LocallabColor::read(const rtengine::procparams::ProcParams* pp, const Param toolcol->set_active(spot.toolcol); fftColorMask->set_active(spot.fftColorMask); contcol->setValue(spot.contcol); + // Update GUI according to fftColorMash button state + // Note: Contrary to the others, shall be called before setting 'blurcol' value + updateColorGUI3(); blurcol->setValue(spot.blurcol); blendmaskcol->setValue(spot.blendmaskcol); radmaskcol->setValue(spot.radmaskcol); @@ -1147,9 +1150,6 @@ void LocallabColor::read(const rtengine::procparams::ProcParams* pp, const Param // Update GUI according to merMethod combobox state updateColorGUI2(); - // Update GUI according to fftColorMash button state - updateColorGUI3(); - // Note: No need to manage pedited as batch mode is deactivated for Locallab } @@ -2156,7 +2156,7 @@ void LocallabColor::updateColorGUI2() void LocallabColor::updateColorGUI3() { -/* const double temp = blurcol->getValue(); + const double temp = blurcol->getValue(); if (fftColorMask->get_active()) { blurcol->setLimits(0.2, 1000., 0.5, 0.2); @@ -2165,7 +2165,6 @@ void LocallabColor::updateColorGUI3() } blurcol->setValue(temp); - */ } /* ==== LocallabExposure ==== */ diff --git a/rtgui/locallabtools2.cc b/rtgui/locallabtools2.cc index 0b0e8b228..698af9795 100644 --- a/rtgui/locallabtools2.cc +++ b/rtgui/locallabtools2.cc @@ -2668,6 +2668,10 @@ void LocallabContrast::read(const rtengine::procparams::ProcParams* pp, const Pa localcontMethod->set_active(1); } + fftwlc->set_active(spot.fftwlc); + // Update Local contrast GUI according to fftwlc button state + // Note: Contrary to the others, shall be called before setting 'lcradius' value + updateContrastGUI3(); lcradius->setValue((double)spot.lcradius); lcamount->setValue(spot.lcamount); lcdarkness->setValue(spot.lcdarkness); @@ -2743,7 +2747,6 @@ void LocallabContrast::read(const rtengine::procparams::ProcParams* pp, const Pa deltad->setValue(spot.deltad); wavshapecomp->setCurve(spot.loccompwavcurve); fatres->setValue(spot.fatres); - fftwlc->set_active(spot.fftwlc); enalcMask->set_active(spot.enalcMask); CCmasklcshape->setCurve(spot.CCmasklccurve); LLmasklcshape->setCurve(spot.LLmasklccurve); @@ -2766,9 +2769,6 @@ void LocallabContrast::read(const rtengine::procparams::ProcParams* pp, const Pa // Update Local contrast GUI according to waveshow button state updateContrastGUI2(); - // Update Local contrast GUI according to fftwlc button state - updateContrastGUI3(); - // Note: No need to manage pedited as batch mode is deactivated for Locallab }