Wavelet levels improvements issue2702

This commit is contained in:
jdc
2015-07-05 06:42:35 +02:00
parent af3bb68bf9
commit 4d5081909f
10 changed files with 444 additions and 27 deletions

View File

@@ -357,6 +357,13 @@ void ParamsEdited::set (bool v) {
wavelet.median = v;
wavelet.medianlev = v;
wavelet.linkedg = v;
wavelet.cbenab = v;
wavelet.greenhigh = v;
wavelet.greenmed = v;
wavelet.greenlow = v;
wavelet.bluehigh = v;
wavelet.bluemed = v;
wavelet.bluelow = v;
wavelet.lipst = v;
wavelet.Medgreinf = v;
wavelet.avoid = v;
@@ -781,6 +788,13 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
wavelet.median = wavelet.median && p.wavelet.median == other.wavelet.median;
wavelet.medianlev = wavelet.medianlev && p.wavelet.medianlev == other.wavelet.medianlev;
wavelet.linkedg = wavelet.linkedg && p.wavelet.linkedg == other.wavelet.linkedg;
wavelet.cbenab = wavelet.cbenab && p.wavelet.cbenab == other.wavelet.cbenab;
wavelet.greenmed = wavelet.greenmed && p.wavelet.greenmed == other.wavelet.greenmed;
wavelet.bluemed = wavelet.bluemed && p.wavelet.bluemed == other.wavelet.bluemed;
wavelet.greenhigh = wavelet.greenhigh && p.wavelet.greenhigh == other.wavelet.greenhigh;
wavelet.bluehigh = wavelet.bluehigh && p.wavelet.bluehigh == other.wavelet.bluehigh;
wavelet.greenlow = wavelet.greenlow && p.wavelet.greenlow == other.wavelet.greenlow;
wavelet.bluelow = wavelet.bluelow && p.wavelet.bluelow == other.wavelet.bluelow;
wavelet.lipst = wavelet.lipst && p.wavelet.lipst == other.wavelet.lipst;
wavelet.Medgreinf = wavelet.Medgreinf && p.wavelet.Medgreinf == other.wavelet.Medgreinf;
wavelet.avoid = wavelet.avoid && p.wavelet.avoid == other.wavelet.avoid;
@@ -1209,6 +1223,13 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
if (wavelet.median) toEdit.wavelet.median = mods.wavelet.median;
if (wavelet.medianlev) toEdit.wavelet.medianlev = mods.wavelet.medianlev;
if (wavelet.linkedg) toEdit.wavelet.linkedg = mods.wavelet.linkedg;
if (wavelet.cbenab) toEdit.wavelet.cbenab = mods.wavelet.cbenab;
if (wavelet.greenhigh) toEdit.wavelet.greenhigh = mods.wavelet.greenhigh;
if (wavelet.bluehigh) toEdit.wavelet.bluehigh = mods.wavelet.bluehigh;
if (wavelet.greenmed) toEdit.wavelet.greenmed = mods.wavelet.greenmed;
if (wavelet.bluemed) toEdit.wavelet.bluemed = mods.wavelet.bluemed;
if (wavelet.greenlow) toEdit.wavelet.greenlow = mods.wavelet.greenlow;
if (wavelet.bluelow) toEdit.wavelet.bluelow = mods.wavelet.bluelow;
if (wavelet.lipst) toEdit.wavelet.lipst = mods.wavelet.lipst;
if (wavelet.Medgreinf) toEdit.wavelet.Medgreinf = mods.wavelet.Medgreinf;
if (wavelet.avoid) toEdit.wavelet.avoid = mods.wavelet.avoid;