Microcontrast: add Contrast threshold adjuster, #4551

This commit is contained in:
heckflosse
2018-05-13 19:07:13 +02:00
parent 7d59277eb3
commit ee5b1dbbc8
12 changed files with 80 additions and 20 deletions

View File

@@ -175,6 +175,7 @@ void ParamsEdited::set (bool v)
sharpenEdge.threechannels = v;
sharpenMicro.enabled = v;
sharpenMicro.matrix = v;
sharpenMicro.contrast = v;
sharpenMicro.amount = v;
sharpenMicro.uniformity = v;
vibrance.enabled = v;
@@ -691,6 +692,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
sharpenMicro.enabled = sharpenMicro.enabled && p.sharpenMicro.enabled == other.sharpenMicro.enabled;
sharpenMicro.matrix = sharpenMicro.matrix && p.sharpenMicro.matrix == other.sharpenMicro.matrix;
sharpenMicro.amount = sharpenMicro.amount && p.sharpenMicro.amount == other.sharpenMicro.amount;
sharpenMicro.contrast = sharpenMicro.contrast && p.sharpenMicro.contrast == other.sharpenMicro.contrast;
sharpenMicro.uniformity = sharpenMicro.uniformity && p.sharpenMicro.uniformity == other.sharpenMicro.uniformity;
sharpening.enabled = sharpening.enabled && p.sharpening.enabled == other.sharpening.enabled;
sharpening.radius = sharpening.radius && p.sharpening.radius == other.sharpening.radius;
@@ -1564,6 +1566,10 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.sharpenMicro.amount = dontforceSet && options.baBehav[ADDSET_SHARPENMICRO_AMOUNT] ? toEdit.sharpenMicro.amount + mods.sharpenMicro.amount : mods.sharpenMicro.amount;
}
if (sharpenMicro.contrast) {
toEdit.sharpenMicro.contrast = dontforceSet && options.baBehav[ADDSET_SHARPENMICRO_CONTRAST] ? toEdit.sharpenMicro.contrast + mods.sharpenMicro.contrast : mods.sharpenMicro.contrast;
}
if (sharpenMicro.uniformity) {
toEdit.sharpenMicro.uniformity = dontforceSet && options.baBehav[ADDSET_SHARPENMICRO_UNIFORMITY] ? toEdit.sharpenMicro.uniformity + mods.sharpenMicro.uniformity : mods.sharpenMicro.uniformity;
}