liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GUI Exposure PDE - hide softradius

Browse Source
This commit is contained in:
Desmis 2019-09-11 13:01:30 +02:00
parent 0711373021
commit fc7f55e54e
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/iplocallab.cc
View File

@ -9137,7 +9137,11 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
float *dataor = new float[bfwr * bfhr];
float gam = params->locallab.spots.at(sp).gamm;
float igam = 1.f / gam;
/*
if (lp.softradiusexp > 0.f) {
softproc(bufexpfin.get(), bufexpfin.get(), lp.softradiusexp, bfhr, bfwr, 0.0001, 0.00001, 0.1f, sk, multiThread, 0);
}
*/
if (lp.blac < -1000.f) {
Median med;
@ -9222,7 +9226,7 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
}
}
if (lp.softradiusexp > 0.f) {
if (lp.softradiusexp > 0.f && lp.expmet == 0) {
softproc(bufexporig.get(), bufexpfin.get(), lp.softradiusexp, bfh, bfw, 0.0001, 0.00001, 0.1f, sk, multiThread, 0);
// softprocess(bufexporig.get(), buflight, lp.softradiusexp, bfh, bfw, sk, multiThread);
}

17
rtgui/locallab.cc
View File

@ -4163,6 +4163,7 @@ void Locallab::expMethodChanged()
fatdetail->set_sensitive(false);
fatanchor->set_sensitive(false);
fatlevel->set_sensitive(false);
softradiusexp->set_sensitive(true);
} else if (expMethod->get_active_row_number() == 1) {
laplacexp->set_sensitive(true);
balanexp->set_sensitive(true);
@ -4174,6 +4175,7 @@ void Locallab::expMethodChanged()
fatdetail->set_sensitive(true);
fatanchor->set_sensitive(true);
fatlevel->set_sensitive(true);
softradiusexp->set_sensitive(false);
}
enableListener();
@ -4678,10 +4680,12 @@ void Locallab::inversexChanged()
if (expMethod->get_active_row_number() == 0) {
pdeFrame->hide();
softradiusexp->show();
fatFrame->hide();
} else if (expMethod->get_active_row_number() == 1) {
pdeFrame->show();
fatFrame->show();
softradiusexp->hide();
}
showmaskexpMethodinv->hide(); // Being able to change Color & Light mask visibility is useless in batch mode
@ -4703,9 +4707,11 @@ void Locallab::inversexChanged()
if (expMethod->get_active_row_number() == 0) {
pdeFrame->hide();
fatFrame->hide();
softradiusexp->show();
} else if (expMethod->get_active_row_number() == 1) {
pdeFrame->hide();
fatFrame->hide();
softradiusexp->hide();
}
} else {
@ -4721,9 +4727,11 @@ void Locallab::inversexChanged()
if (expMethod->get_active_row_number() == 0) {
pdeFrame->hide();
fatFrame->hide();
softradiusexp->show();
} else if (expMethod->get_active_row_number() == 1) {
pdeFrame->show();
fatFrame->show();
softradiusexp->hide();
}
showmaskexpMethodinv->show();
@ -7736,9 +7744,11 @@ void Locallab::updateSpecificGUIState()
if (expMethod->get_active_row_number() == 0) {
pdeFrame->hide();
fatFrame->hide();
softradiusexp->show();
} else if (expMethod->get_active_row_number() == 1) {
pdeFrame->show();
fatFrame->show();
softradiusexp->hide();
}
showmaskexpMethodinv->hide();
@ -7753,13 +7763,16 @@ void Locallab::updateSpecificGUIState()
expmaskexp->show();
showmaskexpMethodinv->show();
showmaskexpMethod->hide();
softradiusexp->show();
if (expMethod->get_active_row_number() == 0) {
pdeFrame->hide();
fatFrame->hide();
softradiusexp->show();
} else if (expMethod->get_active_row_number() == 1) {
pdeFrame->hide();
fatFrame->hide();
softradiusexp->hide();
}
} else {
structexp->show();
@ -7773,9 +7786,11 @@ void Locallab::updateSpecificGUIState()
if (expMethod->get_active_row_number() == 0) {
pdeFrame->hide();
fatFrame->hide();
softradiusexp->show();
} else if (expMethod->get_active_row_number() == 1) {
pdeFrame->show();
fatFrame->show();
softradiusexp->hide();
}
if (batchMode) {
@ -7838,9 +7853,11 @@ void Locallab::updateSpecificGUIState()
if (expMethod->get_active_row_number() == 0) {
pdeFrame->hide();
fatFrame->hide();
softradiusexp->show();
} else if (expMethod->get_active_row_number() == 1) {
pdeFrame->show();
fatFrame->show();
softradiusexp->hide();
}
if (softMethod->get_active_row_number() == 0) {