Third commit Wavelet pyramid - Blur level curve by level

This commit is contained in:
Desmis
2019-12-13 18:27:54 +01:00
parent a5f7191106
commit 290fa796e8
15 changed files with 168 additions and 72 deletions

View File

@@ -1269,6 +1269,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
locallab.spots.at(j).blurlc = locallab.spots.at(j).blurlc && pSpot.blurlc == otherSpot.blurlc;
locallab.spots.at(j).localcontMethod = locallab.spots.at(j).localcontMethod && pSpot.localcontMethod == otherSpot.localcontMethod;
locallab.spots.at(j).locwavcurve = locallab.spots.at(j).locwavcurve && pSpot.locwavcurve == otherSpot.locwavcurve;
locallab.spots.at(j).loclevwavcurve = locallab.spots.at(j).loclevwavcurve && pSpot.loclevwavcurve == otherSpot.loclevwavcurve;
locallab.spots.at(j).csthreshold = locallab.spots.at(j).csthreshold && pSpot.csthreshold == otherSpot.csthreshold;
// Contrast by detail levels
locallab.spots.at(j).expcbdl = locallab.spots.at(j).expcbdl && pSpot.expcbdl == otherSpot.expcbdl;
@@ -4030,6 +4031,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.locallab.spots.at(i).locwavcurve = mods.locallab.spots.at(i).locwavcurve;
}
if (locallab.spots.at(i).loclevwavcurve) {
toEdit.locallab.spots.at(i).loclevwavcurve = mods.locallab.spots.at(i).loclevwavcurve;
}
if (locallab.spots.at(i).csthreshold) {
toEdit.locallab.spots.at(i).csthreshold = mods.locallab.spots.at(i).csthreshold;
}
@@ -5510,6 +5515,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) :
blurlc(v),
localcontMethod(v),
locwavcurve(v),
loclevwavcurve(v),
csthreshold(v),
// Contrast by detail levels
expcbdl(v),
@@ -5886,6 +5892,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v)
blurlc = v;
localcontMethod = v;
locwavcurve = v;
loclevwavcurve = v;
csthreshold = v;
// Contrast by detail levels
expcbdl = v;