diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc index 47bd0f08a..fb358a105 100644 --- a/rtengine/ipwavelet.cc +++ b/rtengine/ipwavelet.cc @@ -3725,9 +3725,9 @@ void ImProcFunctions::ContAllL(float *koeLi[12], float *maxkoeLi, bool lipschitz float aaarS = (alpha - 1.f) / (cp.t_rsl - cp.b_rsl); float bbbrS = 1.f - cp.b_rsl * aaarS; -// if (level <= cp.numlevH) { //in function of levels - float klevred = 2.f * (waOpacityCurveSH[level * 55.5f] - 0.5f); - if(klevred > 0.f && level <= 6) {// level < 6 to avoid bad use of the curve if user put negative values positives + if (level <= cp.numlevH) { //in function of levels + // float klevred = 2.f * (waOpacityCurveSH[level * 55.5f] - 0.5f); + // if(klevred > 0.f && level <= 6) {// level < 6 to avoid bad use of the curve if user put negative values positives if ((LL100 > cp.t_lhl * kH[level] && LL100 < cp.t_rhl * kH[level])) { kLlevH = alpha; } else if ((LL100 > cp.b_lhl * kH[level] && LL100 <= cp.t_lhl * kH[level])) { @@ -3737,11 +3737,12 @@ void ImProcFunctions::ContAllL(float *koeLi[12], float *maxkoeLi, bool lipschitz } else { kLlevH = 1.f; } - kLlevH = 1.f + (kLlevH - 1.f) * klevred; + // kLlevH = 1.f + (kLlevH - 1.f) * klevred; + // kLlevH = 1.f + (kLlevH - 1.f); } - // if (level >= (9 - cp.numlevS)) { - if(klevred < 0.f && level >= 3) {//level > 3 to avoid bad use of the curve if user put positives values negatives + if (level >= (9 - cp.numlevS)) { + // if(klevred < 0.f && level >= 3) {//level > 3 to avoid bad use of the curve if user put positives values negatives if ((LL100 > cp.t_lsl && LL100 < cp.t_rsl)) { kLlevS = alpha; } else if ((LL100 > cp.b_lsl && LL100 <= cp.t_lsl)) { @@ -3751,7 +3752,7 @@ void ImProcFunctions::ContAllL(float *koeLi[12], float *maxkoeLi, bool lipschitz } else { kLlevS = 1.f; } - kLlevS = 1.f - (kLlevS - 1.f) * klevred; + // kLlevS = 1.f - (kLlevS - 1.f) * klevred; } } else { diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc index 2dc4aa05c..00a46d640 100644 --- a/rtgui/wavelet.cc +++ b/rtgui/wavelet.cc @@ -440,10 +440,10 @@ Wavelet::Wavelet() : contrastSHVBox->pack_start(*HSmethod); contrastSHVBox->pack_start(*hllev); - // contrastSHVBox->pack_start(*threshold); + contrastSHVBox->pack_start(*threshold); contrastSHVBox->pack_start(*bllev); -// contrastSHVBox->pack_start(*threshold2); - contrastSHVBox->pack_start(*curveEditorC); + contrastSHVBox->pack_start(*threshold2); + // contrastSHVBox->pack_start(*curveEditorC); Gtk::Frame* const contrastSHFrame = Gtk::manage(new Gtk::Frame(M("TP_WAVELET_APPLYTO"))); contrastSHFrame->add(*contrastSHVBox); levBox->pack_start(*contrastSHFrame);