Added method Illuminant to make choices easier in free mode

This commit is contained in:
Desmis
2020-03-04 16:31:49 +01:00
parent a356306728
commit 05f365c0d6
7 changed files with 133 additions and 1 deletions

View File

@@ -219,6 +219,7 @@ void ParamsEdited::set(bool v)
colorappearance.adaplum = v;
colorappearance.badpixsl = v;
colorappearance.wbmodel = v;
colorappearance.illum = v;
colorappearance.algo = v;
colorappearance.jlight = v;
@@ -812,6 +813,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
colorappearance.adaplum = colorappearance.adaplum && p.colorappearance.adaplum == other.colorappearance.adaplum;
colorappearance.badpixsl = colorappearance.badpixsl && p.colorappearance.badpixsl == other.colorappearance.badpixsl;
colorappearance.wbmodel = colorappearance.wbmodel && p.colorappearance.wbmodel == other.colorappearance.wbmodel;
colorappearance.illum = colorappearance.illum && p.colorappearance.illum == other.colorappearance.illum;
colorappearance.algo = colorappearance.algo && p.colorappearance.algo == other.colorappearance.algo;
colorappearance.jlight = colorappearance.jlight && p.colorappearance.jlight == other.colorappearance.jlight;
colorappearance.qbright = colorappearance.qbright && p.colorappearance.qbright == other.colorappearance.qbright;
@@ -2010,6 +2012,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.colorappearance.wbmodel = mods.colorappearance.wbmodel;
}
if (colorappearance.illum) {
toEdit.colorappearance.illum = mods.colorappearance.illum;
}
if (colorappearance.algo) {
toEdit.colorappearance.algo = mods.colorappearance.algo;
}