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

merged 'localcontrast' into 'dev'

Browse Source
This commit is contained in:
Alberto Griggio
2017-12-20 23:16:28 +01:00
parent 3a29434345 1c1bb8fafc
commit 62585bc434
27 changed files with 645 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
rtgui/paramsedited.cc
View File

@@ -98,6 +98,11 @@ void ParamsEdited::set (bool v)
labCurve.avoidcolorshift = v;
labCurve.rstprotection = v;
labCurve.lcredsk = v;
localContrast.enabled = v;
localContrast.radius = v;
localContrast.amount = v;
localContrast.darkness = v;
localContrast.lightness = v;
rgbCurves.enabled = v;
rgbCurves.lumamode = v;
rgbCurves.rcurve = v;
@@ -644,6 +649,13 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
labCurve.avoidcolorshift = labCurve.avoidcolorshift && p.labCurve.avoidcolorshift == other.labCurve.avoidcolorshift;
labCurve.rstprotection = labCurve.rstprotection && p.labCurve.rstprotection == other.labCurve.rstprotection;
labCurve.lcredsk = labCurve.lcredsk && p.labCurve.lcredsk == other.labCurve.lcredsk;
localContrast.enabled = localContrast.enabled && p.localContrast.enabled == other.localContrast.enabled;
localContrast.radius = localContrast.radius && p.localContrast.radius == other.localContrast.radius;
localContrast.amount = localContrast.amount && p.localContrast.amount == other.localContrast.amount;
localContrast.darkness = localContrast.darkness && p.localContrast.darkness == other.localContrast.darkness;
localContrast.lightness = localContrast.lightness && p.localContrast.lightness == other.localContrast.lightness;
rgbCurves.enabled = rgbCurves.enabled && p.rgbCurves.enabled == other.rgbCurves.enabled;
rgbCurves.lumamode = rgbCurves.lumamode && p.rgbCurves.lumamode == other.rgbCurves.lumamode;
rgbCurves.rcurve = rgbCurves.rcurve && p.rgbCurves.rcurve == other.rgbCurves.rcurve;
@@ -1372,6 +1384,22 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.labCurve.lcredsk = mods.labCurve.lcredsk;
}
if (localContrast.enabled) {
toEdit.localContrast.enabled = mods.localContrast.enabled;
}
if (localContrast.radius) {
toEdit.localContrast.radius = mods.localContrast.radius;
}
if (localContrast.amount) {
toEdit.localContrast.amount = mods.localContrast.amount;
}
if (localContrast.darkness) {
toEdit.localContrast.darkness = mods.localContrast.darkness;
}
if (localContrast.lightness) {
toEdit.localContrast.lightness = mods.localContrast.lightness;
}
if (rgbCurves.enabled) {
toEdit.rgbCurves.enabled = mods.rgbCurves.enabled;
}