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

Clarity and Sharpening from Manuel Llorens #issue814

Browse Source
This commit is contained in:
jdc
2011-07-07 08:04:58 +02:00
parent 9ffdb41ddb
commit b024e815f6
24 changed files with 968 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rtgui/paramsedited.cc
View File

@@ -62,6 +62,14 @@ void ParamsEdited::set (bool v) {
sharpening.deconvradius = v;
sharpening.deconviter = v;
sharpening.deconvdamping = v;
clarity.clpasses = v;
clarity.clstrength = v;
clarity.mlstrength = v;
clarity.uniformity = v;
clarity.enabled = v;
clarity.enabledtwo = v;
clarity.clthreechannels = v;
clarity.MLmicromatrix = v;
colorBoost.amount = v;
colorBoost.avoidclip = v;
colorBoost.enable_saturationlimiter = v;
@@ -215,6 +223,14 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
labCurve.avoidclip = labCurve.avoidclip && p.labCurve.avoidclip == other.labCurve.avoidclip;
labCurve.enable_saturationlimiter = labCurve.enable_saturationlimiter && p.labCurve.enable_saturationlimiter == other.labCurve.enable_saturationlimiter;
labCurve.saturationlimit = labCurve.saturationlimit && p.labCurve.saturationlimit == other.labCurve.saturationlimit;
clarity.enabled = clarity.enabled && p.clarity.enabled == other.clarity.enabled;
clarity.clpasses = clarity.clpasses && p.clarity.clpasses == other.clarity.clpasses;
clarity.clstrength = clarity.clstrength && p.clarity.clstrength == other.clarity.clstrength;
clarity.enabledtwo = clarity.enabledtwo && p.clarity.enabledtwo == other.clarity.enabledtwo;
clarity.MLmicromatrix = clarity.MLmicromatrix && p.clarity.MLmicromatrix == other.clarity.MLmicromatrix;
clarity.mlstrength = clarity.mlstrength && p.clarity.mlstrength == other.clarity.mlstrength;
clarity.uniformity = clarity.uniformity && p.clarity.uniformity == other.clarity.uniformity;
clarity.clthreechannels = clarity.clthreechannels && p.clarity.clthreechannels == other.clarity.clthreechannels;
sharpening.enabled = sharpening.enabled && p.sharpening.enabled == other.sharpening.enabled;
sharpening.radius = sharpening.radius && p.sharpening.radius == other.sharpening.radius;
sharpening.amount = sharpening.amount && p.sharpening.amount == other.sharpening.amount;
@@ -379,6 +395,14 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
if (labCurve.avoidclip) toEdit.labCurve.avoidclip = mods.labCurve.avoidclip;
if (labCurve.enable_saturationlimiter)toEdit.labCurve.enable_saturationlimiter = mods.labCurve.enable_saturationlimiter;
if (labCurve.saturationlimit) toEdit.labCurve.saturationlimit = mods.labCurve.saturationlimit;
if (clarity.enabled) toEdit.clarity.enabled = mods.clarity.enabled;
if (clarity.clpasses) toEdit.clarity.clpasses = dontforceSet && options.baBehav[ADDSET_CLAR_PASS] ? toEdit.clarity.clpasses + mods.clarity.clpasses : mods.clarity.clpasses;
if (clarity.clstrength) toEdit.clarity.clstrength = dontforceSet && options.baBehav[ADDSET_CLAR_STREN] ? toEdit.clarity.clstrength + mods.clarity.clstrength : mods.clarity.clstrength;
if (clarity.enabledtwo) toEdit.clarity.enabledtwo = mods.clarity.enabledtwo;
if (clarity.MLmicromatrix) toEdit.clarity.MLmicromatrix = mods.clarity.MLmicromatrix;
if (clarity.mlstrength) toEdit.clarity.mlstrength = dontforceSet && options.baBehav[ADDSET_CLAR_MLSTREN] ? toEdit.clarity.mlstrength + mods.clarity.mlstrength : mods.clarity.mlstrength;
if (clarity.uniformity) toEdit.clarity.uniformity = dontforceSet && options.baBehav[ADDSET_CLAR_UNIFORMITY] ? toEdit.clarity.uniformity + mods.clarity.uniformity : mods.clarity.uniformity;
if (clarity.clthreechannels) toEdit.clarity.clthreechannels = mods.clarity.clthreechannels;
if (sharpening.enabled) toEdit.sharpening.enabled = mods.sharpening.enabled;
if (sharpening.radius) toEdit.sharpening.radius = mods.sharpening.radius;
if (sharpening.amount) toEdit.sharpening.amount = dontforceSet && options.baBehav[ADDSET_SHARP_AMOUNT] ? toEdit.sharpening.amount + mods.sharpening.amount : mods.sharpening.amount;