Clean and save code

This commit is contained in:
Desmis
2019-10-28 17:15:31 +01:00
parent 23e36a5daa
commit b608ce7efb
17 changed files with 112 additions and 79 deletions

View File

@@ -976,6 +976,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
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;
locallab.spots.at(j).savrest = locallab.spots.at(j).savrest && pSpot.savrest == otherSpot.savrest;
locallab.spots.at(j).scopemask = locallab.spots.at(j).scopemask && pSpot.scopemask == otherSpot.scopemask;
locallab.spots.at(j).lumask = locallab.spots.at(j).lumask && pSpot.lumask == otherSpot.lumask;
// Color & Light
@@ -2830,6 +2831,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.locallab.spots.at(i).shortc = mods.locallab.spots.at(i).shortc;
}
if (locallab.spots.at(i).savrest) {
toEdit.locallab.spots.at(i).savrest = mods.locallab.spots.at(i).savrest;
}
// Color & Light
if (locallab.spots.at(i).expcolor) {
toEdit.locallab.spots.at(i).expcolor = mods.locallab.spots.at(i).expcolor;
@@ -4873,6 +4878,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) :
laplac(v),
deltae(v),
shortc(v),
savrest(v),
scopemask(v),
lumask(v),
// Color & Light
@@ -5177,6 +5183,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v)
laplac = v;
deltae = v;
shortc = v;
savrest = v;
scopemask = v;
lumask = v;
// Color & Light