merge with dev

This commit is contained in:
Desmis
2020-01-13 08:33:45 +01:00
20 changed files with 489 additions and 159 deletions

View File

@@ -69,12 +69,13 @@ 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) {
if(pp->wavelet.enabled) {
if(pp->wavelet.tmrs == 0 || pp->wavelet.TMmethod == "cont") {
strength->set_sensitive (true);
gamma->set_sensitive (true);
} else {
} else if(pp->wavelet.tmrs != 0 && pp->wavelet.TMmethod == "tm") {
strength->set_sensitive (false);
gamma->set_sensitive (false);
}
@@ -98,12 +99,13 @@ void EdgePreservingDecompositionUI::write(ProcParams *pp, ParamsEdited *pedited)
pp->epd.reweightingIterates = reweightingIterates->getValue();
pp->epd.enabled = getEnabled();
strength->set_sensitive (true);
gamma->set_sensitive (true);
/*
if(pp->wavelet.enabled) {
if(pp->wavelet.tmrs == 0) {
if(pp->wavelet.enabled) {
if(pp->wavelet.tmrs == 0 || pp->wavelet.TMmethod == "cont") {
strength->set_sensitive (true);
gamma->set_sensitive (true);
} else {
} else if(pp->wavelet.tmrs != 0 && pp->wavelet.TMmethod == "tm") {
strength->set_sensitive (false);
gamma->set_sensitive (false);
}