diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index e256fda80..203efacad 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -8865,7 +8865,7 @@ void ImProcFunctions::DeNoise(int call, float * slidL, float * slida, float * sl } } - if(lp.enablMask && lp.lnoiselow !=1.f) { + if(lp.enablMask && lp.lnoiselow !=1.f && lp.smasktyp != 0) { //this code has been reviewed by Ingo in september 2020 PR5903 float hig = lp.thrhigh; if(lp.thrhigh < lp.thrlow) { @@ -9466,7 +9466,7 @@ void ImProcFunctions::DeNoise(int call, float * slidL, float * slida, float * sl } } - if(lp.enablMask && lp.lnoiselow != 1.f) { + if(lp.enablMask && lp.lnoiselow != 1.f && lp.smasktyp != 0) { //this code has been reviewed by Ingo in september 2020 PR5903 //i just change parameters to better progressivity float hig = lp.thrhigh; diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index cdf48cef0..52478bfd3 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -3367,7 +3367,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : 0.35, 0.35 }, - showmaskblMethodtyp("blur"), + showmaskblMethodtyp("nois"), CCmaskblcurve{ static_cast(FCT_MinMaxCPoints), 0.0, diff --git a/rtgui/locallabtools.cc b/rtgui/locallabtools.cc index 1bf32a84b..cb4fc3312 100644 --- a/rtgui/locallabtools.cc +++ b/rtgui/locallabtools.cc @@ -5949,7 +5949,7 @@ LocallabBlur::LocallabBlur(): showmaskblMethodtyp->append(M("TP_LOCALLAB_SHOWMASKTYP1")); showmaskblMethodtyp->append(M("TP_LOCALLAB_SHOWMASKTYP2")); showmaskblMethodtyp->append(M("TP_LOCALLAB_SHOWMASKTYP3")); - showmaskblMethodtyp->set_active(0); + showmaskblMethodtyp->set_active(1); showmaskblMethodtypConn = showmaskblMethodtyp->signal_changed().connect(sigc::mem_fun(*this, &LocallabBlur::showmaskblMethodtypChanged)); enablMaskConn = enablMask->signal_toggled().connect(sigc::mem_fun(*this, &LocallabBlur::enablMaskChanged)); @@ -6691,6 +6691,11 @@ void LocallabBlur::adjusterChanged(Adjuster* a, double newval) } if (a == lnoiselow) { + if(lnoiselow->getValue()!= 1.) { + if (showmaskblMethodtyp->get_active_row_number() == 0) { + showmaskblMethodtyp->set_active(2); + } + } if (listener) { listener->panelChanged(Evlocallablnoiselow, lnoiselow->getTextValue() + " (" + escapeHtmlChars(spotName) + ")"); @@ -6938,7 +6943,7 @@ void LocallabBlur::convertParamToSimple() } else if (defSpot.showmaskblMethodtyp == "all") { showmaskblMethodtyp->set_active(2); } - + lnoiselow->setValue(defSpot.lnoiselow); enablMask->set_active(defSpot.enablMask); CCmaskblshape->setCurve(defSpot.CCmaskblcurve); LLmaskblshape->setCurve(defSpot.LLmaskblcurve); @@ -6982,6 +6987,11 @@ void LocallabBlur::updateGUIToMode(const modeType new_type) // Specific Simple mode widgets are shown in Normal mode expmaskbl->show(); expdenoise1->show(); + if(lnoiselow->getValue()!= 1.) { + if (showmaskblMethodtyp->get_active_row_number() == 0) { + showmaskblMethodtyp->set_active(2); + } + } break; @@ -7001,6 +7011,12 @@ void LocallabBlur::updateGUIToMode(const modeType new_type) shadmaskblsha->show(); mask2blCurveEditorGwav->show(); csThresholdblur->show(); + if(lnoiselow->getValue()!= 1.) { + if (showmaskblMethodtyp->get_active_row_number() == 0) { + showmaskblMethodtyp->set_active(2); + } + } + } } @@ -7177,6 +7193,12 @@ void LocallabBlur::showmaskblMethodChanged() void LocallabBlur::showmaskblMethodtypChanged() { + if(lnoiselow->getValue()!= 1.) { + if (showmaskblMethodtyp->get_active_row_number() == 0) { + showmaskblMethodtyp->set_active(2); + } + } + // If mask preview is activated, deactivate all other tool mask preview if (locToolListener) { locToolListener->resetOtherMaskView(this);