add chroma to cbdl

This commit is contained in:
Desmis
2017-10-12 17:46:31 +02:00
parent c62be4dec9
commit baa2d91ee6
16 changed files with 353 additions and 95 deletions

View File

@@ -395,6 +395,7 @@ void ParamsEdited::set (bool v)
}
locallab.threshold = v;
locallab.chromacbdl = v;
locallab.pastels = v;
locallab.saturated = v;
locallab.psthreshold = v;
@@ -1035,6 +1036,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
}
locallab.threshold = locallab.threshold && p.locallab.threshold == other.locallab.threshold;
locallab.chromacbdl = locallab.chromacbdl && p.locallab.chromacbdl == other.locallab.chromacbdl;
locallab.pastels = locallab.pastels && p.locallab.pastels == other.locallab.pastels;
locallab.saturated = locallab.saturated && p.locallab.saturated == other.locallab.saturated;
locallab.psthreshold = locallab.psthreshold && p.locallab.psthreshold == other.locallab.psthreshold;
@@ -2702,6 +2704,10 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.locallab.threshold = mods.locallab.threshold;
}
if (locallab.chromacbdl) {
toEdit.locallab.chromacbdl = mods.locallab.chromacbdl;
}
if (pcvignette.enabled) {
toEdit.pcvignette.enabled = mods.pcvignette.enabled;
}