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

capture sharpening: own compilation unit, smooth progressbar, #5412

Browse Source
This commit is contained in:
Ingo Weyrich
2019-08-30 14:45:45 +02:00
parent ad52c4afc6
commit f882309f59
10 changed files with 277 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtgui/paramsedited.cc
View File

@@ -169,7 +169,6 @@ void ParamsEdited::set(bool v)
pdsharpening.contrast = v;
pdsharpening.autoContrast = v;
pdsharpening.gamma = v;
pdsharpening.deconvamount = v;
pdsharpening.deconvradius = v;
pdsharpening.deconviter = v;
prsharpening.enabled = v;
@@ -1733,10 +1732,6 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.pdsharpening.autoContrast = mods.pdsharpening.autoContrast;
}
if (pdsharpening.deconvamount) {
toEdit.pdsharpening.deconvamount = dontforceSet && options.baBehav[ADDSET_SHARP_AMOUNT] ? toEdit.pdsharpening.deconvamount + mods.pdsharpening.deconvamount : mods.pdsharpening.deconvamount;
}
if (pdsharpening.gamma) {
toEdit.pdsharpening.gamma = dontforceSet && options.baBehav[ADDSET_SHARP_GAMMA] ? toEdit.pdsharpening.gamma + mods.pdsharpening.gamma : mods.pdsharpening.gamma;
}
@@ -3292,7 +3287,7 @@ bool FilmNegativeParamsEdited::isUnchanged() const
return enabled && redRatio && greenExp && blueRatio;
}
bool SharpeningParamsEdited::isUnchanged() const
bool CaptureSharpeningParamsEdited::isUnchanged() const
{
return enabled && contrast && autoContrast && gamma && deconvradius && deconviter;
}