Merge remote-tracking branch 'dev/newlocallab' into newlocallab
This commit is contained in:
@@ -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;
|
||||
@@ -243,10 +244,12 @@ void ParamsEdited::set(bool v)
|
||||
colorappearance.curveMode2 = v;
|
||||
colorappearance.curveMode3 = v;
|
||||
colorappearance.tempout = v;
|
||||
colorappearance.autotempout = v;
|
||||
colorappearance.greenout = v;
|
||||
colorappearance.ybout = v;
|
||||
colorappearance.tempsc = v;
|
||||
colorappearance.greensc = v;
|
||||
colorappearance.presetcat02 = v;
|
||||
|
||||
//colorBoost.amount = v;
|
||||
//colorBoost.avoidclip = v;
|
||||
@@ -491,8 +494,19 @@ void ParamsEdited::set(bool v)
|
||||
wavelet.bluemed = v;
|
||||
wavelet.bluelow = v;
|
||||
wavelet.lipst = v;
|
||||
wavelet.ballum = v;
|
||||
wavelet.balchrom = v;
|
||||
wavelet.chromfi = v;
|
||||
wavelet.chromco = v;
|
||||
wavelet.mergeL = v;
|
||||
wavelet.mergeC = v;
|
||||
wavelet.softrad = v;
|
||||
wavelet.softradend = v;
|
||||
wavelet.Medgreinf = v;
|
||||
wavelet.ushamethod = v;
|
||||
wavelet.avoid = v;
|
||||
wavelet.showmask = v;
|
||||
wavelet.oldsh = v;
|
||||
wavelet.tmr = v;
|
||||
wavelet.Lmethod = v;
|
||||
wavelet.CLmethod = v;
|
||||
@@ -507,10 +521,17 @@ void ParamsEdited::set(bool v)
|
||||
wavelet.TMmethod = v;
|
||||
wavelet.HSmethod = v;
|
||||
wavelet.Dirmethod = v;
|
||||
wavelet.rescon = v;
|
||||
wavelet.sigma = v;
|
||||
wavelet.sigma = v;
|
||||
wavelet.offset = v;
|
||||
wavelet.lowthr = v;
|
||||
wavelet.resconH = v;
|
||||
wavelet.reschro = v;
|
||||
wavelet.resblur = v;
|
||||
wavelet.resblurc = v;
|
||||
wavelet.tmrs = v;
|
||||
wavelet.edgs = v;
|
||||
wavelet.scale = v;
|
||||
wavelet.gamma = v;
|
||||
wavelet.sup = v;
|
||||
wavelet.sky = v;
|
||||
@@ -526,21 +547,26 @@ void ParamsEdited::set(bool v)
|
||||
wavelet.chro = v;
|
||||
wavelet.contrast = v;
|
||||
wavelet.edgrad = v;
|
||||
wavelet.edgeffect = v;
|
||||
wavelet.edgval = v;
|
||||
wavelet.edgthresh = v;
|
||||
wavelet.thr = v;
|
||||
wavelet.thrH = v;
|
||||
wavelet.radius = v;
|
||||
wavelet.skinprotect = v;
|
||||
wavelet.hueskin = v;
|
||||
wavelet.hueskin2 = v;
|
||||
wavelet.hllev = v;
|
||||
wavelet.bllev = v;
|
||||
wavelet.edgcont = v;
|
||||
wavelet.chrwav = v;
|
||||
wavelet.bluwav = v;
|
||||
wavelet.level0noise = v;
|
||||
wavelet.level1noise = v;
|
||||
wavelet.level2noise = v;
|
||||
wavelet.level3noise = v;
|
||||
wavelet.ccwcurve = v;
|
||||
wavelet.blcurve = v;
|
||||
wavelet.opacityCurveRG = v;
|
||||
wavelet.opacityCurveBY = v;
|
||||
wavelet.opacityCurveW = v;
|
||||
@@ -556,9 +582,11 @@ void ParamsEdited::set(bool v)
|
||||
// wavelet.enaedge = v;
|
||||
// wavelet.enares = v;
|
||||
wavelet.expfinal = v;
|
||||
wavelet.expclari = v;
|
||||
wavelet.expcontrast = v;
|
||||
wavelet.expchroma = v;
|
||||
wavelet.expedge = v;
|
||||
wavelet.expbl = v;
|
||||
wavelet.expresid = v;
|
||||
wavelet.exptoning = v;
|
||||
wavelet.expnoise = v;
|
||||
@@ -603,6 +631,7 @@ void ParamsEdited::set(bool v)
|
||||
filmNegative.redRatio = v;
|
||||
filmNegative.greenExp = v;
|
||||
filmNegative.blueRatio = v;
|
||||
filmNegative.baseValues = v;
|
||||
|
||||
exif = v;
|
||||
iptc = v;
|
||||
@@ -814,6 +843,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;
|
||||
@@ -837,10 +867,12 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
|
||||
colorappearance.curveMode2 = colorappearance.curveMode2 && p.colorappearance.curveMode2 == other.colorappearance.curveMode2;
|
||||
colorappearance.curveMode3 = colorappearance.curveMode3 && p.colorappearance.curveMode3 == other.colorappearance.curveMode3;
|
||||
colorappearance.tempout = colorappearance.tempout && p.colorappearance.tempout == other.colorappearance.tempout;
|
||||
colorappearance.autotempout = colorappearance.autotempout && p.colorappearance.autotempout == other.colorappearance.autotempout;
|
||||
colorappearance.greenout = colorappearance.greenout && p.colorappearance.greenout == other.colorappearance.greenout;
|
||||
colorappearance.ybout = colorappearance.ybout && p.colorappearance.ybout == other.colorappearance.ybout;
|
||||
colorappearance.tempsc = colorappearance.tempsc && p.colorappearance.tempsc == other.colorappearance.tempsc;
|
||||
colorappearance.greensc = colorappearance.greensc && p.colorappearance.greensc == other.colorappearance.greensc;
|
||||
colorappearance.presetcat02 = colorappearance.presetcat02 && p.colorappearance.presetcat02 == other.colorappearance.presetcat02;
|
||||
|
||||
//colorBoost.amount = colorBoost.amount && p.colorBoost.amount == other.colorBoost.amount;
|
||||
//colorBoost.avoidclip = colorBoost.avoidclip && p.colorBoost.avoidclip == other.colorBoost.avoidclip;
|
||||
@@ -1533,8 +1565,19 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
|
||||
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.bluehigh = wavelet.bluehigh && p.wavelet.bluehigh == other.wavelet.bluehigh;
|
||||
wavelet.ballum = wavelet.ballum && p.wavelet.ballum == other.wavelet.ballum;
|
||||
wavelet.balchrom = wavelet.balchrom && p.wavelet.balchrom == other.wavelet.balchrom;
|
||||
wavelet.chromfi = wavelet.chromfi && p.wavelet.chromfi == other.wavelet.chromfi;
|
||||
wavelet.chromco = wavelet.chromco && p.wavelet.chromco == other.wavelet.chromco;
|
||||
wavelet.mergeL = wavelet.mergeL && p.wavelet.mergeL == other.wavelet.mergeL;
|
||||
wavelet.mergeC = wavelet.mergeC && p.wavelet.mergeC == other.wavelet.mergeC;
|
||||
wavelet.softrad = wavelet.softrad && p.wavelet.softrad == other.wavelet.softrad;
|
||||
wavelet.softradend = wavelet.softradend && p.wavelet.softradend == other.wavelet.softradend;
|
||||
wavelet.ushamethod = wavelet.ushamethod && p.wavelet.ushamethod == other.wavelet.ushamethod;
|
||||
wavelet.avoid = wavelet.avoid && p.wavelet.avoid == other.wavelet.avoid;
|
||||
wavelet.showmask = wavelet.showmask && p.wavelet.showmask == other.wavelet.showmask;
|
||||
wavelet.oldsh = wavelet.oldsh && p.wavelet.oldsh == other.wavelet.oldsh;
|
||||
wavelet.tmr = wavelet.tmr && p.wavelet.tmr == other.wavelet.tmr;
|
||||
wavelet.Lmethod = wavelet.Lmethod && p.wavelet.Lmethod == other.wavelet.Lmethod;
|
||||
wavelet.CLmethod = wavelet.CLmethod && p.wavelet.CLmethod == other.wavelet.CLmethod;
|
||||
@@ -1549,10 +1592,17 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
|
||||
wavelet.TMmethod = wavelet.TMmethod && p.wavelet.TMmethod == other.wavelet.TMmethod;
|
||||
wavelet.HSmethod = wavelet.HSmethod && p.wavelet.HSmethod == other.wavelet.HSmethod;
|
||||
wavelet.Dirmethod = wavelet.Dirmethod && p.wavelet.Dirmethod == other.wavelet.Dirmethod;
|
||||
wavelet.sigma = wavelet.sigma && p.wavelet.sigma == other.wavelet.sigma;
|
||||
wavelet.offset = wavelet.offset && p.wavelet.offset == other.wavelet.offset;
|
||||
wavelet.lowthr = wavelet.lowthr && p.wavelet.lowthr == other.wavelet.lowthr;
|
||||
wavelet.rescon = wavelet.rescon && p.wavelet.rescon == other.wavelet.rescon;
|
||||
wavelet.resconH = wavelet.resconH && p.wavelet.resconH == other.wavelet.resconH;
|
||||
wavelet.reschro = wavelet.reschro && p.wavelet.reschro == other.wavelet.reschro;
|
||||
wavelet.resblur = wavelet.resblur && p.wavelet.resblur == other.wavelet.resblur;
|
||||
wavelet.resblurc = wavelet.resblurc && p.wavelet.resblurc == other.wavelet.resblurc;
|
||||
wavelet.tmrs = wavelet.tmrs && p.wavelet.tmrs == other.wavelet.tmrs;
|
||||
wavelet.edgs = wavelet.edgs && p.wavelet.edgs == other.wavelet.edgs;
|
||||
wavelet.scale = wavelet.scale && p.wavelet.scale == other.wavelet.scale;
|
||||
wavelet.gamma = wavelet.gamma && p.wavelet.gamma == other.wavelet.gamma;
|
||||
wavelet.sup = wavelet.sup && p.wavelet.sup == other.wavelet.sup;
|
||||
wavelet.sky = wavelet.sky && p.wavelet.sky == other.wavelet.sky;
|
||||
@@ -1568,15 +1618,19 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
|
||||
wavelet.chro = wavelet.chro && p.wavelet.chro == other.wavelet.chro;
|
||||
wavelet.contrast = wavelet.contrast && p.wavelet.contrast == other.wavelet.contrast;
|
||||
wavelet.edgrad = wavelet.edgrad && p.wavelet.edgrad == other.wavelet.edgrad;
|
||||
wavelet.edgeffect = wavelet.edgeffect && p.wavelet.edgeffect == other.wavelet.edgeffect;
|
||||
wavelet.edgval = wavelet.edgval && p.wavelet.edgval == other.wavelet.edgval;
|
||||
wavelet.edgthresh = wavelet.edgthresh && p.wavelet.edgthresh == other.wavelet.edgthresh;
|
||||
wavelet.thr = wavelet.thr && p.wavelet.thr == other.wavelet.thr;
|
||||
wavelet.thrH = wavelet.thrH && p.wavelet.thrH == other.wavelet.thrH;
|
||||
wavelet.radius = wavelet.radius && p.wavelet.radius == other.wavelet.radius;
|
||||
wavelet.hueskin = wavelet.hueskin && p.wavelet.hueskin == other.wavelet.hueskin;
|
||||
wavelet.hueskin2 = wavelet.hueskin2 && p.wavelet.hueskin2 == other.wavelet.hueskin2;
|
||||
wavelet.hllev = wavelet.hllev && p.wavelet.hllev == other.wavelet.hllev;
|
||||
wavelet.bllev = wavelet.bllev && p.wavelet.bllev == other.wavelet.bllev;
|
||||
wavelet.edgcont = wavelet.edgcont && p.wavelet.edgcont == other.wavelet.edgcont;
|
||||
wavelet.chrwav = wavelet.chrwav && p.wavelet.chrwav == other.wavelet.chrwav;
|
||||
wavelet.bluwav = wavelet.bluwav && p.wavelet.bluwav == other.wavelet.bluwav;
|
||||
wavelet.level0noise = wavelet.level0noise && p.wavelet.level0noise == other.wavelet.level0noise;
|
||||
wavelet.level1noise = wavelet.level1noise && p.wavelet.level1noise == other.wavelet.level1noise;
|
||||
wavelet.level2noise = wavelet.level2noise && p.wavelet.level2noise == other.wavelet.level2noise;
|
||||
@@ -1584,6 +1638,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
|
||||
wavelet.pastlev = wavelet.pastlev && p.wavelet.pastlev == other.wavelet.pastlev;
|
||||
wavelet.satlev = wavelet.satlev && p.wavelet.satlev == other.wavelet.satlev;
|
||||
wavelet.ccwcurve = wavelet.ccwcurve && p.wavelet.ccwcurve == other.wavelet.ccwcurve;
|
||||
wavelet.blcurve = wavelet.blcurve && p.wavelet.blcurve == other.wavelet.blcurve;
|
||||
wavelet.opacityCurveRG = wavelet.opacityCurveRG && p.wavelet.opacityCurveRG == other.wavelet.opacityCurveRG;
|
||||
wavelet.opacityCurveBY = wavelet.opacityCurveBY && p.wavelet.opacityCurveBY == other.wavelet.opacityCurveBY;
|
||||
wavelet.opacityCurveW = wavelet.opacityCurveW && p.wavelet.opacityCurveW == other.wavelet.opacityCurveW;
|
||||
@@ -1596,10 +1651,12 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
|
||||
wavelet.expcontrast = wavelet.expcontrast && p.wavelet.expcontrast == other.wavelet.expcontrast;
|
||||
wavelet.expchroma = wavelet.expchroma && p.wavelet.expchroma == other.wavelet.expchroma;
|
||||
wavelet.expedge = wavelet.expedge && p.wavelet.expedge == other.wavelet.expedge;
|
||||
wavelet.expbl = wavelet.expbl && p.wavelet.expbl == other.wavelet.expbl;
|
||||
wavelet.expresid = wavelet.expresid && p.wavelet.expresid == other.wavelet.expresid;
|
||||
wavelet.expfinal = wavelet.expfinal && p.wavelet.expfinal == other.wavelet.expfinal;
|
||||
wavelet.exptoning = wavelet.exptoning && p.wavelet.exptoning == other.wavelet.exptoning;
|
||||
wavelet.expnoise = wavelet.expnoise && p.wavelet.expnoise == other.wavelet.expnoise;
|
||||
wavelet.expclari = wavelet.expclari && p.wavelet.expclari == other.wavelet.expclari;
|
||||
|
||||
for (int level = 0; level < 9; ++level) {
|
||||
wavelet.c[level] = wavelet.c[level] && p.wavelet.c[level] == other.wavelet.c[level];
|
||||
@@ -1637,6 +1694,9 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
|
||||
filmNegative.redRatio = filmNegative.redRatio && p.filmNegative.redRatio == other.filmNegative.redRatio;
|
||||
filmNegative.greenExp = filmNegative.greenExp && p.filmNegative.greenExp == other.filmNegative.greenExp;
|
||||
filmNegative.blueRatio = filmNegative.blueRatio && p.filmNegative.blueRatio == other.filmNegative.blueRatio;
|
||||
filmNegative.baseValues = filmNegative.baseValues && p.filmNegative.redBase == other.filmNegative.redBase
|
||||
&& p.filmNegative.greenBase == other.filmNegative.greenBase
|
||||
&& p.filmNegative.blueBase == other.filmNegative.blueBase;
|
||||
|
||||
// How the hell can we handle that???
|
||||
// exif = exif && p.exif==other.exif
|
||||
@@ -2452,6 +2512,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;
|
||||
}
|
||||
@@ -2460,6 +2524,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
|
||||
toEdit.colorappearance.tempout = mods.colorappearance.tempout;
|
||||
}
|
||||
|
||||
if (colorappearance.autotempout) {
|
||||
toEdit.colorappearance.autotempout = mods.colorappearance.autotempout;
|
||||
}
|
||||
|
||||
if (colorappearance.greenout) {
|
||||
toEdit.colorappearance.greenout = mods.colorappearance.greenout;
|
||||
}
|
||||
@@ -2529,6 +2597,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
|
||||
toEdit.colorappearance.tonecie = mods.colorappearance.tonecie;
|
||||
}
|
||||
|
||||
if (colorappearance.presetcat02) {
|
||||
toEdit.colorappearance.presetcat02 = mods.colorappearance.presetcat02;
|
||||
}
|
||||
|
||||
// if (colorappearance.sharpcie) toEdit.colorappearance.sharpcie = mods.colorappearance.sharpcie;
|
||||
if (impulseDenoise.enabled) {
|
||||
toEdit.impulseDenoise.enabled = mods.impulseDenoise.enabled;
|
||||
@@ -5025,6 +5097,38 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
|
||||
toEdit.wavelet.bluelow = mods.wavelet.bluelow;
|
||||
}
|
||||
|
||||
if (wavelet.ballum) {
|
||||
toEdit.wavelet.ballum = mods.wavelet.ballum;
|
||||
}
|
||||
|
||||
if (wavelet.balchrom) {
|
||||
toEdit.wavelet.balchrom = mods.wavelet.balchrom;
|
||||
}
|
||||
|
||||
if (wavelet.chromfi) {
|
||||
toEdit.wavelet.chromfi = mods.wavelet.chromfi;
|
||||
}
|
||||
|
||||
if (wavelet.chromco) {
|
||||
toEdit.wavelet.chromco = mods.wavelet.chromco;
|
||||
}
|
||||
|
||||
if (wavelet.mergeL) {
|
||||
toEdit.wavelet.mergeL = mods.wavelet.mergeL;
|
||||
}
|
||||
|
||||
if (wavelet.mergeC) {
|
||||
toEdit.wavelet.mergeC = mods.wavelet.mergeC;
|
||||
}
|
||||
|
||||
if (wavelet.softrad) {
|
||||
toEdit.wavelet.softrad = mods.wavelet.softrad;
|
||||
}
|
||||
|
||||
if (wavelet.softradend) {
|
||||
toEdit.wavelet.softradend = mods.wavelet.softradend;
|
||||
}
|
||||
|
||||
if (wavelet.lipst) {
|
||||
toEdit.wavelet.lipst = mods.wavelet.lipst;
|
||||
}
|
||||
@@ -5033,10 +5137,22 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
|
||||
toEdit.wavelet.Medgreinf = mods.wavelet.Medgreinf;
|
||||
}
|
||||
|
||||
if (wavelet.ushamethod) {
|
||||
toEdit.wavelet.ushamethod = mods.wavelet.ushamethod;
|
||||
}
|
||||
|
||||
if (wavelet.avoid) {
|
||||
toEdit.wavelet.avoid = mods.wavelet.avoid;
|
||||
}
|
||||
|
||||
if (wavelet.showmask) {
|
||||
toEdit.wavelet.showmask = mods.wavelet.showmask;
|
||||
}
|
||||
|
||||
if (wavelet.oldsh) {
|
||||
toEdit.wavelet.oldsh = mods.wavelet.oldsh;
|
||||
}
|
||||
|
||||
if (wavelet.tmr) {
|
||||
toEdit.wavelet.tmr = mods.wavelet.tmr;
|
||||
}
|
||||
@@ -5109,6 +5225,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
|
||||
toEdit.wavelet.thrH = dontforceSet && options.baBehav[ADDSET_WA_THRRH] ? toEdit.wavelet.thrH + mods.wavelet.thrH : mods.wavelet.thrH;
|
||||
}
|
||||
|
||||
if (wavelet.radius) {
|
||||
toEdit.wavelet.radius = dontforceSet && options.baBehav[ADDSET_WA_RADIUS] ? toEdit.wavelet.radius + mods.wavelet.radius : mods.wavelet.radius;
|
||||
}
|
||||
|
||||
if (wavelet.sup) {
|
||||
toEdit.wavelet.sup = mods.wavelet.sup;
|
||||
}
|
||||
@@ -5125,6 +5245,14 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
|
||||
toEdit.wavelet.edgcont = mods.wavelet.edgcont;
|
||||
}
|
||||
|
||||
if (wavelet.chrwav) {
|
||||
toEdit.wavelet.chrwav = mods.wavelet.chrwav;
|
||||
}
|
||||
|
||||
if (wavelet.bluwav) {
|
||||
toEdit.wavelet.bluwav = mods.wavelet.bluwav;
|
||||
}
|
||||
|
||||
if (wavelet.level0noise) {
|
||||
toEdit.wavelet.level0noise = mods.wavelet.level0noise;
|
||||
}
|
||||
@@ -5153,6 +5281,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
|
||||
toEdit.wavelet.ccwcurve = mods.wavelet.ccwcurve;
|
||||
}
|
||||
|
||||
if (wavelet.blcurve) {
|
||||
toEdit.wavelet.blcurve = mods.wavelet.blcurve;
|
||||
}
|
||||
|
||||
if (wavelet.opacityCurveRG) {
|
||||
toEdit.wavelet.opacityCurveRG = mods.wavelet.opacityCurveRG;
|
||||
}
|
||||
@@ -5194,6 +5326,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
|
||||
toEdit.wavelet.expedge = mods.wavelet.expedge;
|
||||
}
|
||||
|
||||
if (wavelet.expbl) {
|
||||
toEdit.wavelet.expbl = mods.wavelet.expbl;
|
||||
}
|
||||
|
||||
if (wavelet.expresid) {
|
||||
toEdit.wavelet.expresid = mods.wavelet.expresid;
|
||||
}
|
||||
@@ -5202,6 +5338,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
|
||||
toEdit.wavelet.expfinal = mods.wavelet.expfinal;
|
||||
}
|
||||
|
||||
if (wavelet.expclari) {
|
||||
toEdit.wavelet.expclari = mods.wavelet.expclari;
|
||||
}
|
||||
|
||||
if (wavelet.exptoning) {
|
||||
toEdit.wavelet.exptoning = mods.wavelet.exptoning;
|
||||
}
|
||||
@@ -5242,6 +5382,30 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
|
||||
toEdit.wavelet.edgeampli = mods.wavelet.edgeampli;
|
||||
}
|
||||
|
||||
if (wavelet.sigma) {
|
||||
toEdit.wavelet.sigma = mods.wavelet.sigma;
|
||||
}
|
||||
|
||||
if (wavelet.offset) {
|
||||
toEdit.wavelet.offset = mods.wavelet.offset;
|
||||
}
|
||||
|
||||
if (wavelet.lowthr) {
|
||||
toEdit.wavelet.lowthr = mods.wavelet.lowthr;
|
||||
}
|
||||
|
||||
if (wavelet.resblur) {
|
||||
toEdit.wavelet.resblur = mods.wavelet.resblur;
|
||||
}
|
||||
|
||||
if (wavelet.edgeffect) {
|
||||
toEdit.wavelet.edgeffect = mods.wavelet.edgeffect;
|
||||
}
|
||||
|
||||
if (wavelet.resblurc) {
|
||||
toEdit.wavelet.resblurc = mods.wavelet.resblurc;
|
||||
}
|
||||
|
||||
if (wavelet.resconH) {
|
||||
toEdit.wavelet.resconH = dontforceSet && options.baBehav[ADDSET_WA_RESCONH] ? toEdit.wavelet.resconH + mods.wavelet.resconH : mods.wavelet.resconH;
|
||||
}
|
||||
@@ -5254,6 +5418,14 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
|
||||
toEdit.wavelet.tmrs = dontforceSet && options.baBehav[ADDSET_WA_TMRS] ? toEdit.wavelet.tmrs + mods.wavelet.tmrs : mods.wavelet.tmrs;
|
||||
}
|
||||
|
||||
if (wavelet.edgs) {
|
||||
toEdit.wavelet.edgs = dontforceSet && options.baBehav[ADDSET_WA_EDGS] ? toEdit.wavelet.edgs + mods.wavelet.edgs : mods.wavelet.edgs;
|
||||
}
|
||||
|
||||
if (wavelet.scale) {
|
||||
toEdit.wavelet.scale = dontforceSet && options.baBehav[ADDSET_WA_SCALE] ? toEdit.wavelet.scale + mods.wavelet.scale : mods.wavelet.scale;
|
||||
}
|
||||
|
||||
if (wavelet.gamma) {
|
||||
toEdit.wavelet.gamma = dontforceSet && options.baBehav[ADDSET_WA_GAMMA] ? toEdit.wavelet.gamma + mods.wavelet.gamma : mods.wavelet.gamma;
|
||||
}
|
||||
@@ -5418,6 +5590,12 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
|
||||
toEdit.filmNegative.blueRatio = mods.filmNegative.blueRatio;
|
||||
}
|
||||
|
||||
if (filmNegative.baseValues) {
|
||||
toEdit.filmNegative.redBase = mods.filmNegative.redBase;
|
||||
toEdit.filmNegative.greenBase = mods.filmNegative.greenBase;
|
||||
toEdit.filmNegative.blueBase = mods.filmNegative.blueBase;
|
||||
}
|
||||
|
||||
// Exif changes are added to the existing ones
|
||||
if (exif) {
|
||||
for (procparams::ExifPairs::const_iterator i = mods.exif.begin(); i != mods.exif.end(); ++i) {
|
||||
@@ -5464,7 +5642,7 @@ bool RetinexParamsEdited::isUnchanged() const
|
||||
|
||||
bool FilmNegativeParamsEdited::isUnchanged() const
|
||||
{
|
||||
return enabled && redRatio && greenExp && blueRatio;
|
||||
return enabled && redRatio && greenExp && blueRatio && baseValues;
|
||||
}
|
||||
|
||||
LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) :
|
||||
|
Reference in New Issue
Block a user