diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index 9f35c723b..0b9b6c25f 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -1247,7 +1247,7 @@ void ImProcFunctions::exlabLocal(const local_params& lp, int bfh, int bfw, LabIm float hlrange = maxran - shoulder; float linear = lp.linear; // printf("linear=%f mean=%f expc=%f\n", linear, mean, lp.expcomp); - float kl = 1.f; + float kl = 1.5f; float addcomp = 0.f; #ifdef _OPENMP #pragma omp parallel for diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index fbfbbffee..6796fd585 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2418,7 +2418,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : softradiusexp(0.0), expMethod("std"), laplacexp(20.0), - balanexp(0.8), + balanexp(0.5), linear(0.0), // Shadow highlight expshadhigh(false), diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 4ba566ccf..a19f95ce4 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -199,7 +199,7 @@ Locallab::Locallab(): slomaskexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SLOMASKCOL"), 0.0, 15.0, 0.1, 0.))), softradiusexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SOFTRADIUSCOL"), 0.0, 100.0, 0.1, 0.))), laplacexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LAPLACEXP"), 0.0, 100.0, 0.1, 20.))), - balanexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BALANEXP"), 0.4, 1.1, 0.01, 0.8))), + balanexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BALANEXP"), 0.2, 1.0, 0.01, 0.5))), linear(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LINEAR"), 0., 1., 0.01, 0.))), //Shadow hightlights highlights(Gtk::manage(new Adjuster(M("TP_SHADOWSHLIGHTS_HIGHLIGHTS"), 0, 100, 1, 0))), @@ -670,9 +670,6 @@ Locallab::Locallab(): exposeBox->pack_start(*expMethod); exposeBox->pack_start(*pdeFrame); -// exposeBox->pack_start(*laplacexp); - // exposeBox->pack_start(*linear); - // exposeBox->pack_start(*balanexp); exposeBox->pack_start(*expcomp); exposeBox->pack_start(*hlcompr); exposeBox->pack_start(*hlcomprthresh); @@ -3210,20 +3207,18 @@ void Locallab::showmaskexpMethodChanged() void Locallab::expMethodChanged() { - printf("expMethodChanged\n"); + // printf("expMethodChanged\n"); disableListener(); if (expMethod->get_active_row_number() == 0) { - // printf("exp hide\n"); - pdeFrame->hide(); + pdeFrame->set_sensitive(false); laplacexp->set_sensitive(false); balanexp->set_sensitive(false); linear->set_sensitive(false); } else if(expMethod->get_active_row_number() == 1){ - // printf("exp show\n"); laplacexp->set_sensitive(true); balanexp->set_sensitive(true); linear->set_sensitive(true); - pdeFrame->show(); + pdeFrame->set_sensitive(true); } enableListener(); @@ -3573,8 +3568,13 @@ void Locallab::inversexChanged() structexp->show(); blurexpde->show(); shadex->show(); - pdeFrame->show(); expMethod->show(); + if (expMethod->get_active_row_number() == 0) { + pdeFrame->hide(); + } else if (expMethod->get_active_row_number() == 1) { + pdeFrame->show(); + } + softradiusexp->show(); showmaskexpMethod->hide(); // Being able to change Color & Light mask visibility is useless in batch mode } else if (inversex->get_active()) { @@ -3584,9 +3584,13 @@ void Locallab::inversexChanged() structexp->hide(); shadex->hide(); blurexpde->show(); - softradiusexp->hide(); - pdeFrame->hide(); + softradiusexp->hide(); expMethod->hide(); + if (expMethod->get_active_row_number() == 0) { + pdeFrame->hide(); + } else if (expMethod->get_active_row_number() == 1) { + pdeFrame->hide(); + } } else { sensiex->show(); @@ -3596,8 +3600,13 @@ void Locallab::inversexChanged() blurexpde->show(); softradiusexp->show(); shadex->show(); - pdeFrame->show(); expMethod->show(); + if (expMethod->get_active_row_number() == 0) { + pdeFrame->hide(); + } else if (expMethod->get_active_row_number() == 1) { + pdeFrame->show(); + } + if (batchMode) { showmaskexpMethod->hide(); // Being able to change Color & Light mask visibility is useless in batch mode @@ -6196,20 +6205,34 @@ void Locallab::updateSpecificGUIState() softradiusexp->show(); shadex->show(); expMethod->show(); - pdeFrame->show(); + if (expMethod->get_active_row_number() == 0) { + pdeFrame->hide(); + } else if (expMethod->get_active_row_number() == 1) { + pdeFrame->show(); + } + showmaskexpMethod->hide(); // Being able to change Color & Light mask visibility is useless in batch mode } else if (inversex->get_active()) { structexp->hide(); softradiusexp->hide(); shadex->hide(); expMethod->hide(); - pdeFrame->hide(); + if (expMethod->get_active_row_number() == 0) { + pdeFrame->hide(); + } else if (expMethod->get_active_row_number() == 1) { + pdeFrame->hide(); + } } else { structexp->show(); softradiusexp->show(); shadex->show(); expMethod->show(); - pdeFrame->show(); + if (expMethod->get_active_row_number() == 0) { + pdeFrame->hide(); + } else if (expMethod->get_active_row_number() == 1) { + pdeFrame->show(); + } + if (batchMode) { showmaskexpMethod->hide(); // Being able to change Color & Light mask visibility is useless in batch mode }