Suppress interaction between wavelet and tone-mapping
This commit is contained in:
parent
d8564cb652
commit
01fbc2eddf
|
@ -5131,11 +5131,11 @@ void ImProcFunctions::EPDToneMapCIE (CieImage *ncie, float a_w, float c_, int Wi
|
|||
if (!params->epd.enabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
if (params->wavelet.enabled && params->wavelet.tmrs != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
*/
|
||||
float stren = params->epd.strength;
|
||||
float edgest = params->epd.edgeStopping;
|
||||
float sca = params->epd.scale;
|
||||
|
@ -5245,11 +5245,11 @@ void ImProcFunctions::EPDToneMap (LabImage *lab, unsigned int Iterates, int skip
|
|||
if (!params->epd.enabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
if (params->wavelet.enabled && params->wavelet.tmrs != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
*/
|
||||
float stren = params->epd.strength;
|
||||
float edgest = params->epd.edgeStopping;
|
||||
float sca = params->epd.scale;
|
||||
|
|
|
@ -70,7 +70,7 @@ void EdgePreservingDecompositionUI::read(const ProcParams *pp, const ParamsEdite
|
|||
setEnabled(pp->epd.enabled);
|
||||
strength->set_sensitive (true);
|
||||
gamma->set_sensitive (true);
|
||||
|
||||
/*
|
||||
if(pp->wavelet.enabled) {
|
||||
if(pp->wavelet.tmrs == 0 || pp->wavelet.TMmethod == "cont") {
|
||||
strength->set_sensitive (true);
|
||||
|
@ -80,7 +80,7 @@ void EdgePreservingDecompositionUI::read(const ProcParams *pp, const ParamsEdite
|
|||
gamma->set_sensitive (false);
|
||||
}
|
||||
}
|
||||
|
||||
*/
|
||||
strength->setValue(pp->epd.strength);
|
||||
gamma->setValue(pp->epd.gamma);
|
||||
edgeStopping->setValue(pp->epd.edgeStopping);
|
||||
|
@ -100,7 +100,7 @@ void EdgePreservingDecompositionUI::write(ProcParams *pp, ParamsEdited *pedited)
|
|||
pp->epd.enabled = getEnabled();
|
||||
strength->set_sensitive (true);
|
||||
gamma->set_sensitive (true);
|
||||
|
||||
/*
|
||||
if(pp->wavelet.enabled) {
|
||||
if(pp->wavelet.tmrs == 0 || pp->wavelet.TMmethod == "cont") {
|
||||
strength->set_sensitive (true);
|
||||
|
@ -110,7 +110,7 @@ void EdgePreservingDecompositionUI::write(ProcParams *pp, ParamsEdited *pedited)
|
|||
gamma->set_sensitive (false);
|
||||
}
|
||||
}
|
||||
|
||||
*/
|
||||
if(pedited) {
|
||||
pedited->epd.strength = strength->getEditedState();
|
||||
pedited->epd.gamma = gamma->getEditedState();
|
||||
|
|
Loading…
Reference in New Issue