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

Choice in settings recursive references

Browse Source
This commit is contained in:
Desmis
2019-10-29 08:14:15 +01:00
parent d80357c284
commit c08c48f906
12 changed files with 246 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtgui/paramsedited.cc
View File

@@ -973,6 +973,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
locallab.spots.at(j).transitweak = locallab.spots.at(j).transitweak && pSpot.transitweak == otherSpot.transitweak;
locallab.spots.at(j).transitgrad = locallab.spots.at(j).transitgrad && pSpot.transitgrad == otherSpot.transitgrad;
locallab.spots.at(j).avoid = locallab.spots.at(j).avoid && pSpot.avoid == otherSpot.avoid;
locallab.spots.at(j).recurs = locallab.spots.at(j).recurs && pSpot.recurs == otherSpot.recurs;
locallab.spots.at(j).laplac = locallab.spots.at(j).laplac && pSpot.laplac == otherSpot.laplac;
locallab.spots.at(j).deltae = locallab.spots.at(j).deltae && pSpot.deltae == otherSpot.deltae;
locallab.spots.at(j).shortc = locallab.spots.at(j).shortc && pSpot.shortc == otherSpot.shortc;
@@ -2819,6 +2820,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.locallab.spots.at(i).avoid = mods.locallab.spots.at(i).avoid;
}
if (locallab.spots.at(i).recurs) {
toEdit.locallab.spots.at(i).recurs = mods.locallab.spots.at(i).recurs;
}
if (locallab.spots.at(i).laplac) {
toEdit.locallab.spots.at(i).laplac = mods.locallab.spots.at(i).laplac;
}
@@ -4875,6 +4880,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) :
transitweak(v),
transitgrad(v),
avoid(v),
recurs(v),
laplac(v),
deltae(v),
shortc(v),
@@ -5180,6 +5186,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v)
transitweak = v;
transitgrad = v;
avoid = v;
recurs = v;
laplac = v;
deltae = v;
shortc = v;