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

Improvment selection GUI mask denoise

Browse Source
This commit is contained in:
Desmis 2020-12-16 07:54:47 +01:00
parent 346e6a37a9
commit 10cc600277
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/iplocallab.cc
View File

@ -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 //this code has been reviewed by Ingo in september 2020 PR5903
float hig = lp.thrhigh; float hig = lp.thrhigh;
if(lp.thrhigh < lp.thrlow) { 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 //this code has been reviewed by Ingo in september 2020 PR5903
//i just change parameters to better progressivity //i just change parameters to better progressivity
float hig = lp.thrhigh; float hig = lp.thrhigh;

2
rtengine/procparams.cc
View File

@ -3367,7 +3367,7 @@ LocallabParams::LocallabSpot::LocallabSpot() :
0.35, 0.35,
0.35 0.35
}, },
showmaskblMethodtyp("blur"), showmaskblMethodtyp("nois"),
CCmaskblcurve{ CCmaskblcurve{
static_cast<double>(FCT_MinMaxCPoints), static_cast<double>(FCT_MinMaxCPoints),
0.0, 0.0,

26
rtgui/locallabtools.cc
View File

@ -5949,7 +5949,7 @@ LocallabBlur::LocallabBlur():
showmaskblMethodtyp->append(M("TP_LOCALLAB_SHOWMASKTYP1")); showmaskblMethodtyp->append(M("TP_LOCALLAB_SHOWMASKTYP1"));
showmaskblMethodtyp->append(M("TP_LOCALLAB_SHOWMASKTYP2")); showmaskblMethodtyp->append(M("TP_LOCALLAB_SHOWMASKTYP2"));
showmaskblMethodtyp->append(M("TP_LOCALLAB_SHOWMASKTYP3")); 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)); showmaskblMethodtypConn = showmaskblMethodtyp->signal_changed().connect(sigc::mem_fun(*this, &LocallabBlur::showmaskblMethodtypChanged));
enablMaskConn = enablMask->signal_toggled().connect(sigc::mem_fun(*this, &LocallabBlur::enablMaskChanged)); 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 (a == lnoiselow) {
if(lnoiselow->getValue()!= 1.) {
if (showmaskblMethodtyp->get_active_row_number() == 0) {
showmaskblMethodtyp->set_active(2);
}
}
if (listener) { if (listener) {
listener->panelChanged(Evlocallablnoiselow, listener->panelChanged(Evlocallablnoiselow,
lnoiselow->getTextValue() + " (" + escapeHtmlChars(spotName) + ")"); lnoiselow->getTextValue() + " (" + escapeHtmlChars(spotName) + ")");
@ -6938,7 +6943,7 @@ void LocallabBlur::convertParamToSimple()
} else if (defSpot.showmaskblMethodtyp == "all") { } else if (defSpot.showmaskblMethodtyp == "all") {
showmaskblMethodtyp->set_active(2); showmaskblMethodtyp->set_active(2);
} }
lnoiselow->setValue(defSpot.lnoiselow);
enablMask->set_active(defSpot.enablMask); enablMask->set_active(defSpot.enablMask);
CCmaskblshape->setCurve(defSpot.CCmaskblcurve); CCmaskblshape->setCurve(defSpot.CCmaskblcurve);
LLmaskblshape->setCurve(defSpot.LLmaskblcurve); LLmaskblshape->setCurve(defSpot.LLmaskblcurve);
@ -6982,6 +6987,11 @@ void LocallabBlur::updateGUIToMode(const modeType new_type)
// Specific Simple mode widgets are shown in Normal mode // Specific Simple mode widgets are shown in Normal mode
expmaskbl->show(); expmaskbl->show();
expdenoise1->show(); expdenoise1->show();
if(lnoiselow->getValue()!= 1.) {
if (showmaskblMethodtyp->get_active_row_number() == 0) {
showmaskblMethodtyp->set_active(2);
}
}
break; break;
@ -7001,6 +7011,12 @@ void LocallabBlur::updateGUIToMode(const modeType new_type)
shadmaskblsha->show(); shadmaskblsha->show();
mask2blCurveEditorGwav->show(); mask2blCurveEditorGwav->show();
csThresholdblur->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() 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 mask preview is activated, deactivate all other tool mask preview
if (locToolListener) { if (locToolListener) {
locToolListener->resetOtherMaskView(this); locToolListener->resetOtherMaskView(this);