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

Improve denoise for PDE Exposure

Browse Source
This commit is contained in:
Desmis 2019-09-15 18:54:54 +02:00
parent eea35577d7
commit 1f63d27ecd
11 changed files with 576 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtdata/languages/default
View File

@ -944,6 +944,7 @@ HISTORY_MSG_697;Local - TM Normalize
HISTORY_MSG_698;Local - Local contrast Fast Fourier HISTORY_MSG_698;Local - Local contrast Fast Fourier
HISTORY_MSG_699;Local - Retinex Fast Fourier HISTORY_MSG_699;Local - Retinex Fast Fourier
HISTORY_MSG_701;Local - Exp Shadows HISTORY_MSG_701;Local - Exp Shadows
HISTORY_MSG_702;Local - Exp Method
HISTORY_MSG_703;Local - Exp Laplacian threshold HISTORY_MSG_703;Local - Exp Laplacian threshold
HISTORY_MSG_704;Local - Exp PDE balance HISTORY_MSG_704;Local - Exp PDE balance
HISTORY_MSG_705;Local - Exp linearity HISTORY_MSG_705;Local - Exp linearity
@ -984,6 +985,7 @@ HISTORY_MSG_744;Local - Exp Fattal Detail
HISTORY_MSG_745;Local - Exp Fattal Anchor HISTORY_MSG_745;Local - Exp Fattal Anchor
HISTORY_MSG_746;Local - Exp Fattal levels HISTORY_MSG_746;Local - Exp Fattal levels
HISTORY_MSG_747;Local Spot created HISTORY_MSG_747;Local Spot created
HISTORY_MSG_748;Local - Exp Denoise
HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction
@ -2139,6 +2141,12 @@ TP_LOCALLAB_LAPLACEXP;Laplacian threshold
TP_LOCALLAB_BALANEXP;PDE balance TP_LOCALLAB_BALANEXP;PDE balance
TP_LOCALLAB_GAMM;Gamma TP_LOCALLAB_GAMM;Gamma
TP_LOCALLAB_REFLABEL;Ref. (0..1) Chroma=%1 Luma=%2 Hue=%3 TP_LOCALLAB_REFLABEL;Ref. (0..1) Chroma=%1 Luma=%2 Hue=%3
TP_LOCALLAB_NOISEMETH;Denoise
TP_LOCALLAB_NONENOISE;None
TP_LOCALLAB_MEDIAN;Median
TP_LOCALLAB_WAVLOW;Wavelet low
TP_LOCALLAB_WAVMED;Wavelet normal
TP_LOCALLAB_WAVHIGH;Wavelet high
TP_LOCALLAB_NOISELUMFINE;Luminance fine 1 (Wav) TP_LOCALLAB_NOISELUMFINE;Luminance fine 1 (Wav)
TP_LOCALLAB_NOISELUMFINEZERO;Luminance fine 0 (Wav) TP_LOCALLAB_NOISELUMFINEZERO;Luminance fine 0 (Wav)
TP_LOCALLAB_NOISELUMFINETWO;Luminance fine 2 (Wav) TP_LOCALLAB_NOISELUMFINETWO;Luminance fine 2 (Wav)

2
rtengine/improcfun.h
View File

@ -335,7 +335,7 @@ public:
void Exclude_Local(float **deltaso, float hueref, float chromaref, float lumaref, float sobelref, float meansobel, const struct local_params & lp, const LabImage * original, LabImage * transformed, const LabImage * rsv, const LabImage * reserv, int cx, int cy, int sk); void Exclude_Local(float **deltaso, float hueref, float chromaref, float lumaref, float sobelref, float meansobel, const struct local_params & lp, const LabImage * original, LabImage * transformed, const LabImage * rsv, const LabImage * reserv, int cx, int cy, int sk);
void DeNoise_Local(int call, const struct local_params& lp, LabImage * originalmask, int levred, float hueref, float lumaref, float chromaref, LabImage* original, LabImage* transformed, LabImage &tmp1, int cx, int cy, int sk); void DeNoise_Local(int call, const struct local_params& lp, LabImage * originalmask, int levred, float hueref, float lumaref, float chromaref, LabImage* original, LabImage* transformed, LabImage &tmp1, int cx, int cy, int sk);
void DeNoise(int call, int del, bool noiscfactiv, const struct local_params& lp, LabImage* originalmaskbl, int levred, float huerefblur, float lumarefblur, float chromarefblur, LabImage* original, LabImage* transformed, int cx, int cy, int sk); void DeNoise(int call, int del, float * slidL, float * slida, float * slidb, int aut, bool noiscfactiv, const struct local_params& lp, LabImage* originalmaskbl, int levred, float huerefblur, float lumarefblur, float chromarefblur, LabImage* original, LabImage* transformed, int cx, int cy, int sk);
void fftw_denoise(int GW, int GH, int max_numblox_W, int min_numblox_W, float **tmp1, array2D<float> *Lin, int numThreads, const struct local_params & lp, int chrom); void fftw_denoise(int GW, int GH, int max_numblox_W, int min_numblox_W, float **tmp1, array2D<float> *Lin, int numThreads, const struct local_params & lp, int chrom);

467
rtengine/iplocallab.cc
View File

@ -1421,7 +1421,7 @@ void ImProcFunctions::exlabLocal(local_params& lp, int bfh, int bfw, LabImage* b
for (int jr = 0; jr < bfw; jr++) { for (int jr = 0; jr < bfw; jr++) {
float L = bufexporig->L[ir][jr]; float L = bufexporig->L[ir][jr];
if (L < mean && lp.expmet == 1 && lp.linear > 0.f && !lp.invex) { if (L < mean && lp.expmet == 1 && lp.linear > 0.f && lp.laplacexp > 0.1f && !lp.invex) {
float Llin = LIM01(L / 32768.f); float Llin = LIM01(L / 32768.f);
addcomp = linear * (-kl * Llin + kl);//maximum about 1.5 IL addcomp = linear * (-kl * Llin + kl);//maximum about 1.5 IL
exp_scale = pow(2.0, (lp.expcomp + addcomp)); exp_scale = pow(2.0, (lp.expcomp + addcomp));
@ -5372,7 +5372,7 @@ void ImProcFunctions::fftw_denoise(int GW, int GH, int max_numblox_W, int min_nu
} }
void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct local_params& lp, LabImage* originalmaskbl, int levred, float huerefblur, float lumarefblur, float chromarefblur, LabImage* original, LabImage* transformed, int cx, int cy, int sk) void ImProcFunctions::DeNoise(int call, int del, float * slidL, float * slida, float * slidb, int aut, bool noiscfactiv, const struct local_params& lp, LabImage* originalmaskbl, int levred, float huerefblur, float lumarefblur, float chromarefblur, LabImage* original, LabImage* transformed, int cx, int cy, int sk)
{ {
//local denoise //local denoise
@ -5382,13 +5382,20 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
bool execcolor = (lp.chro != 0.f || lp.ligh != 0.f || lp.cont != 0); // only if one slider ore more is engaged bool execcolor = (lp.chro != 0.f || lp.ligh != 0.f || lp.cont != 0); // only if one slider ore more is engaged
bool execbdl = (lp.mulloc[0] != 1.f || lp.mulloc[1] != 1.f || lp.mulloc[2] != 1.f || lp.mulloc[3] != 1.f || lp.mulloc[4] != 1.f || lp.mulloc[5] != 1.f) ;//only if user want cbdl bool execbdl = (lp.mulloc[0] != 1.f || lp.mulloc[1] != 1.f || lp.mulloc[2] != 1.f || lp.mulloc[3] != 1.f || lp.mulloc[4] != 1.f || lp.mulloc[5] != 1.f) ;//only if user want cbdl
bool execdenoi = noiscfactiv && ((lp.colorena && execcolor) || (lp.tonemapena && lp.strengt != 0.f) || (lp.cbdlena && execbdl) || (lp.sfena && lp.strng > 0.f) || (lp.lcena && lp.lcamount > 0.f) || (lp.sharpena && lp.shrad > 0.42) || (lp.retiena && lp.str > 0.f) || (lp.exposena && lp.expcomp != 0.f) || (lp.expvib && lp.past != 0.f)); bool execdenoi = noiscfactiv && ((lp.colorena && execcolor) || (lp.tonemapena && lp.strengt != 0.f) || (lp.cbdlena && execbdl) || (lp.sfena && lp.strng > 0.f) || (lp.lcena && lp.lcamount > 0.f) || (lp.sharpena && lp.shrad > 0.42) || (lp.retiena && lp.str > 0.f) || (lp.exposena && lp.expcomp != 0.f) || (lp.expvib && lp.past != 0.f));
printf("OK 1 aut=%i\n", aut);
if (((lp.noiself > 0.f || lp.noiself0 > 0.f || lp.noiself2 > 0.f || lp.noiselc > 0.f || lp.noisecf > 0.f || lp.noisecc > 0.f if (((lp.noiself > 0.f || lp.noiself0 > 0.f || lp.noiself2 > 0.f || lp.noiselc > 0.f || lp.noisecf > 0.f || lp.noisecc > 0.f
|| lp.showmaskblmet == 2 || lp.enablMask || lp.showmaskblmet == 3 || lp.showmaskblmet == 4) && lp.denoiena) || execdenoi) { // sk == 1 ?? || lp.showmaskblmet == 2 || lp.enablMask || lp.showmaskblmet == 3 || lp.showmaskblmet == 4 || aut == 1) && lp.denoiena) || execdenoi) { // sk == 1 ??
StopWatch Stop1("locallab Denoise called");
MyMutex::MyLock lock(*fftwMutex);
if (lp.noisecf >= 0.1f || lp.noisecc >= 0.1f) { StopWatch Stop1("locallab Denoise called");
if (aut == 0) {
MyMutex::MyLock lock(*fftwMutex);
}
if (lp.noisecf >= 0.1f || lp.noisecc >= 0.1f || aut == 1) {
noiscfactiv = false; noiscfactiv = false;
levred = 7; levred = 7;
} }
@ -5454,7 +5461,10 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
} }
float vari[levred]; float vari[levred];
float mxsl = 0.f;
float mxsfl = 0.f;
if (aut == 0) {
if (levred == 7) { if (levred == 7) {
edge = 2; edge = 2;
vari[0] = 8.f * SQR((lp.noiself0 / 125.0) * (1.0 + lp.noiself0 / 25.0)); vari[0] = 8.f * SQR((lp.noiself0 / 125.0) * (1.0 + lp.noiself0 / 25.0));
@ -5473,21 +5483,40 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
vari[3] = 8.f * SQR((lp.noiselc / 125.0) * (1.0 + lp.noiselc / 25.0)); vari[3] = 8.f * SQR((lp.noiselc / 125.0) * (1.0 + lp.noiselc / 25.0));
} }
} else if (aut == 1) {
edge = 2;
vari[0] = SQR(slidL[0]);
vari[1] = SQR(slidL[1]);
vari[2] = SQR(slidL[2]);
float maxf01 = max(slidL[0], slidL[1]);
mxsfl = max(maxf01, slidL[2]);
if ((lp.noiself >= 0.1f || lp.noiself0 >= 0.1f || lp.noiself2 >= 0.1f || lp.noiselc >= 0.1f)) { vari[3] = SQR(slidL[3]);
vari[4] = SQR(slidL[4]);
vari[5] = SQR(slidL[5]);
vari[6] = SQR(slidL[6]);
float mxslid34 = max(slidL[3], slidL[4]);
float mxslid56 = max(slidL[5], slidL[6]);
mxsl = max(mxslid34, mxslid56);
}
printf("mxsl=%f\n", mxsl);
if ((lp.noiself >= 0.1f || lp.noiself0 >= 0.1f || lp.noiself2 >= 0.1f || lp.noiselc >= 0.1f || mxsl >= 0.1f || mxsfl >= 0.1f)) {
float kr3 = 0.f; float kr3 = 0.f;
float kr4 = 0.f; float kr4 = 0.f;
float kr5 = 0.f; float kr5 = 0.f;
if (lp.noiselc < 30.f) { if (lp.noiselc < 30.f || mxsl < 30.f) {
kr3 = 0.f; kr3 = 0.f;
kr4 = 0.f; kr4 = 0.f;
kr5 = 0.f; kr5 = 0.f;
} else if (lp.noiselc < 50.f) { } else if (lp.noiselc < 50.f || mxsl < 50.f) {
kr3 = 0.5f; kr3 = 0.5f;
kr4 = 0.3f; kr4 = 0.3f;
kr5 = 0.2f; kr5 = 0.2f;
} else if (lp.noiselc < 70.f) { } else if (lp.noiselc < 70.f || mxsl < 70.f) {
kr3 = 0.7f; kr3 = 0.7f;
kr4 = 0.5f; kr4 = 0.5f;
kr5 = 0.3f; kr5 = 0.3f;
@ -5508,6 +5537,7 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
vari[6] = max(0.0001f, kr5 * vari[6]); vari[6] = max(0.0001f, kr5 * vari[6]);
} }
float* noisevarlum = new float[GH * GW]; float* noisevarlum = new float[GH * GW];
int GW2 = (GW + 1) / 2; int GW2 = (GW + 1) / 2;
@ -5539,7 +5569,7 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
} }
if (lp.noiselc < 1.f) { if (lp.noiselc < 1.f || mxsl < 1.f) {
WaveletDenoiseAllL(Ldecomp, noisevarlum, madL, vari, edge, numThreads); WaveletDenoiseAllL(Ldecomp, noisevarlum, madL, vari, edge, numThreads);
} else { } else {
WaveletDenoiseAll_BiShrinkL(Ldecomp, noisevarlum, madL, vari, edge, numThreads); WaveletDenoiseAll_BiShrinkL(Ldecomp, noisevarlum, madL, vari, edge, numThreads);
@ -5551,6 +5581,7 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
} }
} }
float variC[levred]; float variC[levred];
float variCb[levred]; float variCb[levred];
@ -5588,7 +5619,10 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
} }
if (!adecomp.memoryAllocationFailed && !bdecomp.memoryAllocationFailed) { if (!adecomp.memoryAllocationFailed && !bdecomp.memoryAllocationFailed) {
float maxcfine = 0.f;
float maxccoarse = 0.f;
if (aut == 0) {
if (levred == 7) { if (levred == 7) {
edge = 2; edge = 2;
variC[0] = SQR(noisecfr); variC[0] = SQR(noisecfr);
@ -5621,10 +5655,41 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
variCb[2] = SQR(lp.noisecf / 10.0); variCb[2] = SQR(lp.noisecf / 10.0);
variCb[3] = SQR(lp.noisecf / 10.0); variCb[3] = SQR(lp.noisecf / 10.0);
}
} else if (aut == 1) {
edge = 2;
variC[0] = SQR(slida[0]);
variC[1] = SQR(slida[1]);
variC[2] = SQR(slida[2]);
variC[3] = SQR(slida[3]);
variC[4] = SQR(slida[4]);
variC[5] = SQR(slida[5]);
variC[6] = SQR(slida[6]);
float maxc01 = max(slida[0], slida[1]);
float maxc23 = max(slida[2], slida[3]);
float max03 = max(maxc01, maxc23);
float maxrf = max(max03, slida[4]);
float maxrc = max(slida[5], slida[6]);
variCb[0] = SQR(slidb[0]);
variCb[1] = SQR(slidb[1]);
variCb[2] = SQR(slidb[2]);
variCb[3] = SQR(slidb[3]);
variCb[4] = SQR(slidb[4]);
variCb[5] = SQR(slidb[5]);
variCb[6] = SQR(slidb[6]);
float maxb01 = max(slidb[0], slidb[1]);
float maxb23 = max(slidb[2], slidb[3]);
float maxb03 = max(maxb01, maxb23);
float maxbf = max(maxb03, slidb[4]);
maxcfine = max(maxrf, maxbf);
float maxbc = max(slidb[5], slidb[6]);
maxccoarse = max(maxrc, maxbc);
} }
if ((lp.noisecf >= 0.1f || lp.noisecc >= 0.1f || noiscfactiv)) { if ((lp.noisecf >= 0.1f || lp.noisecc >= 0.1f || noiscfactiv || maxcfine >= 0.1f || maxccoarse > 0.1f)) {
float minic = 0.0001f; float minic = 0.0001f;
if (noiscfactiv) { if (noiscfactiv) {
@ -5635,51 +5700,51 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
float k2 = 0.f; float k2 = 0.f;
float k3 = 0.f; float k3 = 0.f;
if (lp.noisecf < 0.2f) { if (lp.noisecf < 0.2f || maxcfine < 0.2f) {
k1 = 0.f; k1 = 0.f;
k2 = 0.f; k2 = 0.f;
k3 = 0.f; k3 = 0.f;
} else if (lp.noisecf < 0.3f) { } else if (lp.noisecf < 0.3f || maxcfine < 0.3f) {
k1 = 0.1f; k1 = 0.1f;
k2 = 0.0f; k2 = 0.0f;
k3 = 0.f; k3 = 0.f;
} else if (lp.noisecf < 0.5f) { } else if (lp.noisecf < 0.5f || maxcfine < 0.5f) {
k1 = 0.2f; k1 = 0.2f;
k2 = 0.1f; k2 = 0.1f;
k3 = 0.f; k3 = 0.f;
} else if (lp.noisecf < 0.8f) { } else if (lp.noisecf < 0.8f || maxcfine < 0.8f) {
k1 = 0.3f; k1 = 0.3f;
k2 = 0.25f; k2 = 0.25f;
k3 = 0.f; k3 = 0.f;
} else if (lp.noisecf < 1.f) { } else if (lp.noisecf < 1.f || maxcfine < 1.f) {
k1 = 0.4f; k1 = 0.4f;
k2 = 0.25f; k2 = 0.25f;
k3 = 0.1f; k3 = 0.1f;
} else if (lp.noisecf < 2.f) { } else if (lp.noisecf < 2.f || maxcfine < 2.f) {
k1 = 0.5f; k1 = 0.5f;
k2 = 0.3f; k2 = 0.3f;
k3 = 0.15f; k3 = 0.15f;
} else if (lp.noisecf < 3.f) { } else if (lp.noisecf < 3.f || maxcfine < 3.f) {
k1 = 0.6f; k1 = 0.6f;
k2 = 0.45f; k2 = 0.45f;
k3 = 0.3f; k3 = 0.3f;
} else if (lp.noisecf < 4.f) { } else if (lp.noisecf < 4.f || maxcfine < 4.f) {
k1 = 0.7f; k1 = 0.7f;
k2 = 0.5f; k2 = 0.5f;
k3 = 0.4f; k3 = 0.4f;
} else if (lp.noisecf < 5.f) { } else if (lp.noisecf < 5.f || maxcfine < 5.f) {
k1 = 0.8f; k1 = 0.8f;
k2 = 0.6f; k2 = 0.6f;
k3 = 0.5f; k3 = 0.5f;
} else if (lp.noisecf < 10.f) { } else if (lp.noisecf < 10.f || maxcfine < 10.f) {
k1 = 0.85f; k1 = 0.85f;
k2 = 0.7f; k2 = 0.7f;
k3 = 0.6f; k3 = 0.6f;
} else if (lp.noisecf < 20.f) { } else if (lp.noisecf < 20.f || maxcfine < 20.f) {
k1 = 0.9f; k1 = 0.9f;
k2 = 0.8f; k2 = 0.8f;
k3 = 0.7f; k3 = 0.7f;
} else if (lp.noisecf < 50.f) { } else if (lp.noisecf < 50.f || maxcfine < 50.f) {
k1 = 1.f; k1 = 1.f;
k2 = 1.f; k2 = 1.f;
k3 = 0.9f; k3 = 0.9f;
@ -5705,25 +5770,25 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
float k5 = 0.f; float k5 = 0.f;
float k6 = 0.f; float k6 = 0.f;
if (lp.noisecc == 0.1f) { if (lp.noisecc == 0.1f || maxccoarse == 0.1f) {
k4 = 0.f; k4 = 0.f;
k5 = 0.0f; k5 = 0.0f;
} else if (lp.noisecc < 0.2f) { } else if (lp.noisecc < 0.2f || maxccoarse < 0.2f) {
k4 = 0.1f; k4 = 0.1f;
k5 = 0.0f; k5 = 0.0f;
} else if (lp.noisecc < 0.5f) { } else if (lp.noisecc < 0.5f || maxccoarse < 0.5f) {
k4 = 0.15f; k4 = 0.15f;
k5 = 0.0f; k5 = 0.0f;
} else if (lp.noisecc < 1.f) { } else if (lp.noisecc < 1.f || maxccoarse < 1.f) {
k4 = 0.15f; k4 = 0.15f;
k5 = 0.1f; k5 = 0.1f;
} else if (lp.noisecc < 3.f) { } else if (lp.noisecc < 3.f || maxccoarse < 3.f) {
k4 = 0.3f; k4 = 0.3f;
k5 = 0.15f; k5 = 0.15f;
} else if (lp.noisecc < 4.f) { } else if (lp.noisecc < 4.f || maxccoarse < 5.f) {
k4 = 0.6f; k4 = 0.6f;
k5 = 0.4f; k5 = 0.4f;
} else if (lp.noisecc < 6.f) { } else if (lp.noisecc < 6.f || maxccoarse < 6.f) {
k4 = 0.8f; k4 = 0.8f;
k5 = 0.6f; k5 = 0.6f;
} else { } else {
@ -5731,17 +5796,16 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
k5 = 1.f; k5 = 1.f;
} }
variC[4] = max(0.0001f, k4 * variC[4]); variC[4] = max(0.0001f, k4 * variC[4]);
variC[5] = max(0.0001f, k5 * variC[5]); variC[5] = max(0.0001f, k5 * variC[5]);
variCb[4] = max(0.0001f, k4 * variCb[4]); variCb[4] = max(0.0001f, k4 * variCb[4]);
variCb[5] = max(0.0001f, k5 * variCb[5]); variCb[5] = max(0.0001f, k5 * variCb[5]);
if (lp.noisecc < 4.f) { if (lp.noisecc < 4.f || maxccoarse < 4.f) {
k6 = 0.f; k6 = 0.f;
} else if (lp.noisecc < 5.f) { } else if (lp.noisecc < 5.f || maxccoarse < 5.f) {
k6 = 0.4f; k6 = 0.4f;
} else if (lp.noisecc < 6.f) { } else if (lp.noisecc < 6.f || maxccoarse < 6.f) {
k6 = 0.7f; k6 = 0.7f;
} else { } else {
k6 = 1.f; k6 = 1.f;
@ -5758,7 +5822,7 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
float nvch = 0.6f;//high value float nvch = 0.6f;//high value
float nvcl = 0.1f;//low value float nvcl = 0.1f;//low value
if (lp.noisecf > 100.f) { if (lp.noisecf > 100.f || maxcfine > 100.f) {
nvch = 0.8f; nvch = 0.8f;
nvcl = 0.4f; nvcl = 0.4f;
} }
@ -5789,10 +5853,11 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
float noisevarab_r = 100.f; //SQR(lp.noisecc / 10.0); float noisevarab_r = 100.f; //SQR(lp.noisecc / 10.0);
if (lp.noisecc < 0.1f) { if (lp.noisecc < 0.1f || maxccoarse < 0.1f) {
WaveletDenoiseAllAB(Ldecomp, adecomp, noisevarchrom, madL, variC, edge, noisevarab_r, true, false, false, numThreads); WaveletDenoiseAllAB(Ldecomp, adecomp, noisevarchrom, madL, variC, edge, noisevarab_r, true, false, false, numThreads);
WaveletDenoiseAllAB(Ldecomp, bdecomp, noisevarchrom, madL, variCb, edge, noisevarab_r, true, false, false, numThreads); WaveletDenoiseAllAB(Ldecomp, bdecomp, noisevarchrom, madL, variCb, edge, noisevarab_r, true, false, false, numThreads);
} else { } else {
WaveletDenoiseAll_BiShrinkAB(Ldecomp, adecomp, noisevarchrom, madL, variC, edge, noisevarab_r, true, false, false, numThreads); WaveletDenoiseAll_BiShrinkAB(Ldecomp, adecomp, noisevarchrom, madL, variC, edge, noisevarab_r, true, false, false, numThreads);
WaveletDenoiseAllAB(Ldecomp, adecomp, noisevarchrom, madL, variC, edge, noisevarab_r, true, false, false, numThreads); WaveletDenoiseAllAB(Ldecomp, adecomp, noisevarchrom, madL, variC, edge, noisevarab_r, true, false, false, numThreads);
@ -5821,7 +5886,7 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
Ldecomp.reconstruct(tmp1.L[0]); Ldecomp.reconstruct(tmp1.L[0]);
} }
if (!Ldecomp.memoryAllocationFailed) { if (!Ldecomp.memoryAllocationFailed && aut == 0 && lp.laplacexp < 0.1f) {
if ((lp.noiself >= 0.1f || lp.noiself0 >= 0.1f || lp.noiself2 >= 0.1f || lp.noiselc >= 0.1f) && levred == 7) { if ((lp.noiself >= 0.1f || lp.noiself0 >= 0.1f || lp.noiself2 >= 0.1f || lp.noiselc >= 0.1f) && levred == 7) {
fftw_denoise(GW, GH, max_numblox_W, min_numblox_W, tmp1.L, Lin, numThreads, lp, 0); fftw_denoise(GW, GH, max_numblox_W, min_numblox_W, tmp1.L, Lin, numThreads, lp, 0);
} }
@ -5951,7 +6016,10 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
} }
float vari[levred]; float vari[levred];
float mxsl = 0.f;
float mxsfl = 0.f;
if (aut == 0) {
if (levred == 7) { if (levred == 7) {
edge = 2; edge = 2;
vari[0] = 8.f * SQR((lp.noiself0 / 125.0) * (1.0 + lp.noiself0 / 25.0)); vari[0] = 8.f * SQR((lp.noiself0 / 125.0) * (1.0 + lp.noiself0 / 25.0));
@ -5970,22 +6038,41 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
vari[3] = 8.f * SQR((lp.noiselc / 125.0) * (1.0 + lp.noiselc / 25.0)); vari[3] = 8.f * SQR((lp.noiselc / 125.0) * (1.0 + lp.noiselc / 25.0));
} }
} else if (aut == 1) {
edge = 2;
vari[0] = SQR(slidL[0]);
vari[1] = SQR(slidL[1]);
vari[2] = SQR(slidL[2]);
float maxf01 = max(slidL[0], slidL[1]);
mxsfl = max(maxf01, slidL[2]);
vari[3] = SQR(slidL[3]);
vari[4] = SQR(slidL[4]);
vari[5] = SQR(slidL[5]);
vari[6] = SQR(slidL[6]);
float mxslid34 = max(slidL[3], slidL[4]);
float mxslid56 = max(slidL[5], slidL[6]);
mxsl = max(mxslid34, mxslid56);
}
if ((lp.noiself >= 0.1f || lp.noiself0 >= 0.1f || lp.noiself2 >= 0.1f || lp.noiselc >= 0.1f)) {
if ((lp.noiself >= 0.1f || lp.noiself0 >= 0.1f || lp.noiself2 >= 0.1f || lp.noiselc >= 0.1f || mxsl >= 0.1f || mxsfl >= 0.1f)) {
float kr3 = 0.f; float kr3 = 0.f;
float kr4 = 0.f; float kr4 = 0.f;
float kr5 = 0.f; float kr5 = 0.f;
if (lp.noiselc < 30.f) { if (aut == 0) {
if (lp.noiselc < 30.f || mxsl < 30.f) {
kr3 = 0.f; kr3 = 0.f;
kr4 = 0.f; kr4 = 0.f;
kr5 = 0.f; kr5 = 0.f;
} else if (lp.noiselc < 50.f) { } else if (lp.noiselc < 50.f || mxsl < 50.f) {
kr3 = 0.5f; kr3 = 0.5f;
kr4 = 0.3f; kr4 = 0.3f;
kr5 = 0.2f; kr5 = 0.2f;
} else if (lp.noiselc < 70.f) { } else if (lp.noiselc < 70.f || mxsl < 70.f) {
kr3 = 0.7f; kr3 = 0.7f;
kr4 = 0.5f; kr4 = 0.5f;
kr5 = 0.3f; kr5 = 0.3f;
@ -5994,6 +6081,12 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
kr4 = 1.f; kr4 = 1.f;
kr5 = 1.f; kr5 = 1.f;
} }
} else {
kr3 = 1.f;
kr4 = 1.f;
kr5 = 1.f;
}
vari[0] = max(0.0001f, vari[0]); vari[0] = max(0.0001f, vari[0]);
vari[1] = max(0.0001f, vari[1]); vari[1] = max(0.0001f, vari[1]);
@ -6037,7 +6130,8 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
} }
} }
if (lp.noiselc < 1.f) {
if (lp.noiselc < 1.f || mxsl < 1.f) {
WaveletDenoiseAllL(Ldecomp, noisevarlum, madL, vari, edge, numThreads); WaveletDenoiseAllL(Ldecomp, noisevarlum, madL, vari, edge, numThreads);
} else { } else {
WaveletDenoiseAll_BiShrinkL(Ldecomp, noisevarlum, madL, vari, edge, numThreads); WaveletDenoiseAll_BiShrinkL(Ldecomp, noisevarlum, madL, vari, edge, numThreads);
@ -6088,6 +6182,10 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
if (!adecomp.memoryAllocationFailed && !bdecomp.memoryAllocationFailed) { if (!adecomp.memoryAllocationFailed && !bdecomp.memoryAllocationFailed) {
float maxcfine = 0.f;
float maxccoarse = 0.f;
if (aut == 0) {
if (levred == 7) { if (levred == 7) {
edge = 2; edge = 2;
@ -6123,9 +6221,42 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
} }
} else if (aut == 1) {
edge = 2;
variC[0] = SQR(slida[0]);
variC[1] = SQR(slida[1]);
variC[2] = SQR(slida[2]);
variC[3] = SQR(slida[3]);
variC[4] = SQR(slida[4]);
variC[5] = SQR(slida[5]);
variC[6] = SQR(slida[6]);
float maxc01 = max(slida[0], slida[1]);
float maxc23 = max(slida[2], slida[3]);
float max03 = max(maxc01, maxc23);
float maxrf = max(max03, slida[4]);
float maxrc = max(slida[5], slida[6]);
variCb[0] = SQR(slidb[0]);
variCb[1] = SQR(slidb[1]);
variCb[2] = SQR(slidb[2]);
variCb[3] = SQR(slidb[3]);
variCb[4] = SQR(slidb[4]);
variCb[5] = SQR(slidb[5]);
variCb[6] = SQR(slidb[6]);
float maxb01 = max(slidb[0], slidb[1]);
float maxb23 = max(slidb[2], slidb[3]);
float maxb03 = max(maxb01, maxb23);
float maxbf = max(maxb03, slidb[4]);
maxcfine = max(maxrf, maxbf);
float maxbc = max(slidb[5], slidb[6]);
maxccoarse = max(maxrc, maxbc);
}
if ((lp.noisecf >= 0.1f || lp.noisecc >= 0.1f || noiscfactiv)) {
if ((lp.noisecf >= 0.1f || lp.noisecc >= 0.1f || noiscfactiv || maxcfine >= 0.1f || maxccoarse > 0.1f)) {
float minic = 0.0001f; float minic = 0.0001f;
if (noiscfactiv) { if (noiscfactiv) {
@ -6136,51 +6267,51 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
float k2 = 0.f; float k2 = 0.f;
float k3 = 0.f; float k3 = 0.f;
if (lp.noisecf < 0.2f) { if (lp.noisecf < 0.2f || maxcfine < 0.2f) {
k1 = 0.f; k1 = 0.f;
k2 = 0.f; k2 = 0.f;
k3 = 0.f; k3 = 0.f;
} else if (lp.noisecf < 0.3f) { } else if (lp.noisecf < 0.3f || maxcfine < 0.3f) {
k1 = 0.1f; k1 = 0.1f;
k2 = 0.0f; k2 = 0.0f;
k3 = 0.f; k3 = 0.f;
} else if (lp.noisecf < 0.5f) { } else if (lp.noisecf < 0.5f || maxcfine < 0.5f) {
k1 = 0.2f; k1 = 0.2f;
k2 = 0.1f; k2 = 0.1f;
k3 = 0.f; k3 = 0.f;
} else if (lp.noisecf < 0.8f) { } else if (lp.noisecf < 0.8f || maxcfine < 0.8f) {
k1 = 0.3f; k1 = 0.3f;
k2 = 0.25f; k2 = 0.25f;
k3 = 0.f; k3 = 0.f;
} else if (lp.noisecf < 1.f) { } else if (lp.noisecf < 1.f || maxcfine < 1.f) {
k1 = 0.4f; k1 = 0.4f;
k2 = 0.25f; k2 = 0.25f;
k3 = 0.1f; k3 = 0.1f;
} else if (lp.noisecf < 2.f) { } else if (lp.noisecf < 2.f || maxcfine < 2.f) {
k1 = 0.5f; k1 = 0.5f;
k2 = 0.3f; k2 = 0.3f;
k3 = 0.15f; k3 = 0.15f;
} else if (lp.noisecf < 3.f) { } else if (lp.noisecf < 3.f || maxcfine < 3.f) {
k1 = 0.6f; k1 = 0.6f;
k2 = 0.45f; k2 = 0.45f;
k3 = 0.3f; k3 = 0.3f;
} else if (lp.noisecf < 4.f) { } else if (lp.noisecf < 4.f || maxcfine < 4.f) {
k1 = 0.7f; k1 = 0.7f;
k2 = 0.5f; k2 = 0.5f;
k3 = 0.4f; k3 = 0.4f;
} else if (lp.noisecf < 5.f) { } else if (lp.noisecf < 5.f || maxcfine < 5.f) {
k1 = 0.8f; k1 = 0.8f;
k2 = 0.6f; k2 = 0.6f;
k3 = 0.5f; k3 = 0.5f;
} else if (lp.noisecf < 10.f) { } else if (lp.noisecf < 10.f || maxcfine < 10.f) {
k1 = 0.85f; k1 = 0.85f;
k2 = 0.7f; k2 = 0.7f;
k3 = 0.6f; k3 = 0.6f;
} else if (lp.noisecf < 20.f) { } else if (lp.noisecf < 20.f || maxcfine < 20.f) {
k1 = 0.9f; k1 = 0.9f;
k2 = 0.8f; k2 = 0.8f;
k3 = 0.7f; k3 = 0.7f;
} else if (lp.noisecf < 50.f) { } else if (lp.noisecf < 50.f || maxcfine < 50.f) {
k1 = 1.f; k1 = 1.f;
k2 = 1.f; k2 = 1.f;
k3 = 0.9f; k3 = 0.9f;
@ -6206,25 +6337,25 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
float k5 = 0.f; float k5 = 0.f;
float k6 = 0.f; float k6 = 0.f;
if (lp.noisecc == 0.1f) { if (lp.noisecc == 0.1f || maxccoarse == 0.1f) {
k4 = 0.f; k4 = 0.f;
k5 = 0.0f; k5 = 0.0f;
} else if (lp.noisecc < 0.2f) { } else if (lp.noisecc < 0.2f || maxccoarse < 0.2f) {
k4 = 0.1f; k4 = 0.1f;
k5 = 0.0f; k5 = 0.0f;
} else if (lp.noisecc < 0.5f) { } else if (lp.noisecc < 0.5f || maxccoarse < 0.5f) {
k4 = 0.15f; k4 = 0.15f;
k5 = 0.0f; k5 = 0.0f;
} else if (lp.noisecc < 1.f) { } else if (lp.noisecc < 1.f || maxccoarse < 1.f) {
k4 = 0.15f; k4 = 0.15f;
k5 = 0.1f; k5 = 0.1f;
} else if (lp.noisecc < 3.f) { } else if (lp.noisecc < 3.f || maxccoarse < 3.f) {
k4 = 0.3f; k4 = 0.3f;
k5 = 0.15f; k5 = 0.15f;
} else if (lp.noisecc < 4.f) { } else if (lp.noisecc < 4.f || maxccoarse < 5.f) {
k4 = 0.6f; k4 = 0.6f;
k5 = 0.4f; k5 = 0.4f;
} else if (lp.noisecc < 6.f) { } else if (lp.noisecc < 6.f || maxccoarse < 6.f) {
k4 = 0.8f; k4 = 0.8f;
k5 = 0.6f; k5 = 0.6f;
} else { } else {
@ -6238,11 +6369,11 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
variCb[4] = max(0.0001f, k4 * variCb[4]); variCb[4] = max(0.0001f, k4 * variCb[4]);
variCb[5] = max(0.0001f, k5 * variCb[5]); variCb[5] = max(0.0001f, k5 * variCb[5]);
if (lp.noisecc < 4.f) { if (lp.noisecc < 4.f || maxccoarse < 4.f) {
k6 = 0.f; k6 = 0.f;
} else if (lp.noisecc < 5.f) { } else if (lp.noisecc < 5.f || maxccoarse < 5.f) {
k6 = 0.4f; k6 = 0.4f;
} else if (lp.noisecc < 6.f) { } else if (lp.noisecc < 6.f || maxccoarse < 6.f) {
k6 = 0.7f; k6 = 0.7f;
} else { } else {
k6 = 1.f; k6 = 1.f;
@ -6257,7 +6388,7 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
float nvch = 0.6f;//high value float nvch = 0.6f;//high value
float nvcl = 0.1f;//low value float nvcl = 0.1f;//low value
if (lp.noisecf > 100.f) { if (lp.noisecf > 100.f || maxcfine > 100.f) {
nvch = 0.8f; nvch = 0.8f;
nvcl = 0.4f; nvcl = 0.4f;
} }
@ -6288,7 +6419,7 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
float noisevarab_r = 100.f; //SQR(lp.noisecc / 10.0); float noisevarab_r = 100.f; //SQR(lp.noisecc / 10.0);
if (lp.noisecc < 0.1f) { if (lp.noisecc < 0.1f || maxccoarse < 0.1f) {
WaveletDenoiseAllAB(Ldecomp, adecomp, noisevarchrom, madL, variC, edge, noisevarab_r, true, false, false, numThreads); WaveletDenoiseAllAB(Ldecomp, adecomp, noisevarchrom, madL, variC, edge, noisevarab_r, true, false, false, numThreads);
WaveletDenoiseAllAB(Ldecomp, bdecomp, noisevarchrom, madL, variCb, edge, noisevarab_r, true, false, false, numThreads); WaveletDenoiseAllAB(Ldecomp, bdecomp, noisevarchrom, madL, variCb, edge, noisevarab_r, true, false, false, numThreads);
} else { } else {
@ -6321,7 +6452,7 @@ void ImProcFunctions::DeNoise(int call, int del, bool noiscfactiv, const struct
} }
if (!Ldecomp.memoryAllocationFailed) { if (!Ldecomp.memoryAllocationFailed && aut == 0 && lp.laplacexp < 0.1f) {
if ((lp.noiself >= 0.1f || lp.noiself0 >= 0.1f || lp.noiself2 >= 0.1f || lp.noiselc >= 0.1f) && levred == 7) { if ((lp.noiself >= 0.1f || lp.noiself0 >= 0.1f || lp.noiself2 >= 0.1f || lp.noiselc >= 0.1f) && levred == 7) {
@ -6935,7 +7066,14 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
} }
//local denoise //local denoise
DeNoise(call, del, noiscfactiv, lp, originalmaskbl, levred, huerefblur, lumarefblur, chromarefblur, original, transformed, cx, cy, sk); float slidL[8] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
float slida[8] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
float slidb[8] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
int aut = 0;
if (lp.denoiena) {
DeNoise(call, del, slidL, slida, slidb, aut, noiscfactiv, lp, originalmaskbl, levred, huerefblur, lumarefblur, chromarefblur, original, transformed, cx, cy, sk);
}
if (denoiz || blurz || lp.denoiena || lp.blurena) { if (denoiz || blurz || lp.denoiena || lp.blurena) {
delete originalmaskbl; delete originalmaskbl;
@ -9139,25 +9277,184 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
float gam = params->locallab.spots.at(sp).gamm; float gam = params->locallab.spots.at(sp).gamm;
float igam = 1.f / gam; float igam = 1.f / gam;
/*
if (lp.softradiusexp > 0.f) {
softproc(bufexpfin.get(), bufexpfin.get(), lp.softradiusexp, bfhr, bfwr, 0.0001, 0.00001, 0.1f, sk, multiThread, 0);
}
*/
if (lp.blac < -1000.f) {
Median med;
//soft denoise, user must use Local Denoise to best result LabImage tmp0(bfwr, bfhr);
if (lp.blac < - 10000.f) {
med = Median::TYPE_5X5_SOFT; #ifdef _OPENMP
} else if (lp.blac < - 5000.f) { const int numThreads = omp_get_max_threads();
med = Median::TYPE_3X3_STRONG; #else
} else { const int numThreads = 1;
med = Median:: TYPE_3X3_SOFT;
#endif
for (int ir = 0; ir < bfhr; ir++)
for (int jr = 0; jr < bfwr; jr++) {
tmp0.L[ir][jr] = bufexpfin->L[ir][jr];
tmp0.a[ir][jr] = bufexpfin->a[ir][jr];
tmp0.b[ir][jr] = bufexpfin->b[ir][jr];
} }
Median_Denoise(bufexpfin->L, bufexpfin->L, bfwr, bfhr, med, 1, multiThread); int DaubLen = 6;
int levwavL = 8;
// int skip = 1;
float kwav = 0.02f;
if (params->locallab.spots.at(sp).exnoiseMethod == "wavlo") {
kwav = 0.014f;
}
if (params->locallab.spots.at(sp).exnoiseMethod == "wavhi") {
kwav = 0.03f;
}
wavelet_decomposition Ldecomp(tmp0.L[0], tmp0.W, tmp0.H, levwavL, 1, sk, numThreads, DaubLen);
float madL[8][3];
float madLL[7] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
float madAA[7] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
float madBB[7] = {0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f};
float maxmadL = 0.f;
float maxmadA = 0.f;
float maxmadB = 0.f;
if (!Ldecomp.memoryAllocationFailed) {
#pragma omp parallel for reduction(+:madLL) collapse(2) schedule(dynamic,1)
for (int lvl = 0; lvl < levred; lvl++) {
for (int dir = 1; dir < 4; dir++) {
int Wlvl_L = Ldecomp.level_W(lvl);
int Hlvl_L = Ldecomp.level_H(lvl);
float ** WavCoeffs_L = Ldecomp.level_coeffs(lvl);
madL[lvl][dir - 1] = SQR(Mad(WavCoeffs_L[dir], Wlvl_L * Hlvl_L));
madLL[lvl] += madL[lvl][dir - 1];
}
}
for (int lvl = 0; lvl < levred; lvl++) {
madLL[lvl] = (madLL[lvl] / 3);
madLL[lvl] = kwav * sqrt(madLL[lvl]);
printf("lev=%i madLL=%f", lvl, madLL[lvl]);
maxmadL += madLL[lvl];
}
maxmadL /= levred;
}
printf("N\n");
wavelet_decomposition adecomp(tmp0.a[0], tmp0.W, tmp0.H, levwavL, 1, sk, numThreads, DaubLen);
float mada[8][3];
if (!adecomp.memoryAllocationFailed) {
#pragma omp parallel for reduction(+:madAA) collapse(2) schedule(dynamic,1)
for (int lvl = 0; lvl < levred; lvl++) {
for (int dir = 1; dir < 4; dir++) {
int Wlvl_a = adecomp.level_W(lvl);
int Hlvl_a = adecomp.level_H(lvl);
float ** WavCoeffs_a = adecomp.level_coeffs(lvl);
mada[lvl][dir - 1] = SQR(Mad(WavCoeffs_a[dir], Wlvl_a * Hlvl_a));
madAA[lvl] += mada[lvl][dir - 1];
}
}
for (int lvl = 0; lvl < levred; lvl++) {
madAA[lvl] = madAA[lvl] / 3;
madAA[lvl] = kwav * sqrt(madAA[lvl]);
printf("lev=%i madAA=%f", lvl, madAA[lvl]);
maxmadA += madAA[lvl];
}
maxmadA /= levred;
}
wavelet_decomposition bdecomp(tmp0.b[0], tmp0.W, tmp0.H, levwavL, 1, sk, numThreads, DaubLen);
float madb[8][3];
if (!bdecomp.memoryAllocationFailed) {
#pragma omp parallel for reduction(+:madBB) collapse(2) schedule(dynamic,1)
for (int lvl = 0; lvl < levred; lvl++) {
for (int dir = 1; dir < 4; dir++) {
int Wlvl_b = bdecomp.level_W(lvl);
int Hlvl_b = bdecomp.level_H(lvl);
float ** WavCoeffs_b = bdecomp.level_coeffs(lvl);
madb[lvl][dir - 1] = SQR(Mad(WavCoeffs_b[dir], Wlvl_b * Hlvl_b));
madBB[lvl] += madb[lvl][dir - 1];
}
}
for (int lvl = 0; lvl < levred; lvl++) {
madBB[lvl] = madBB[lvl] / 3;
madBB[lvl] = kwav * sqrt(madBB[lvl]);
printf("lev=%i madBB=%f", lvl, madBB[lvl]);
maxmadB += madBB[lvl];
}
maxmadB /= levred;
}
Ldecomp.reconstruct(tmp0.L[0]);
adecomp.reconstruct(tmp0.a[0]);
bdecomp.reconstruct(tmp0.b[0]);
int provsens = lp.sensden;
bool deno = lp.denoiena;
bool maske = lp.enablMask;
int lequ = lp.noiselequal;
float cequ = lp.adjch;
lp.sensden = 100;
lp.denoiena = true;
lp.enablMask = false;
lp.noiselequal = 7;
lp.adjch = 0;
if (params->locallab.spots.at(sp).exnoiseMethod == "wavlo" || params->locallab.spots.at(sp).exnoiseMethod == "wavme" || params->locallab.spots.at(sp).exnoiseMethod == "wavhi") {
DeNoise(call, 3, madLL, madAA, madBB, 1, false, lp, original, 7, hueref, lumaref, chromaref, original, transformed, cx, cy, sk);
}
lp.sensden = provsens;
lp.denoiena = deno;
lp.enablMask = maske;
lp.noiselequal = lequ;
lp.adjch = cequ;
if (params->locallab.spots.at(sp).exnoiseMethod == "med") {
if (maxmadL > 0.1f) {
Median medL = Median::TYPE_3X3_SOFT;
//soft denoise with median
if (maxmadL > 20.f) {
medL = Median::TYPE_7X7;
} else if (maxmadL > 10.f) {
medL = Median::TYPE_5X5_STRONG;
} else if (maxmadL > 2.f) {
medL = Median::TYPE_5X5_SOFT;
} else if (maxmadL > 0.5f) {
medL = Median::TYPE_3X3_STRONG;
} else if (maxmadL > 0.2f) {
medL = Median::TYPE_3X3_SOFT;
}
Median_Denoise(bufexpfin->L, bufexpfin->L, bfwr, bfhr, medL, 1, multiThread);
if (maxmadB > 0.1f || maxmadA > 0.1f) {
Median_Denoise(bufexpfin->a, bufexpfin->a, bfwr, bfhr, Median::TYPE_3X3_SOFT, 1, multiThread);
Median_Denoise(bufexpfin->b, bufexpfin->b, bfwr, bfhr, Median::TYPE_3X3_SOFT, 1, multiThread);
}
}
} }
#ifdef _OPENMP #ifdef _OPENMP

1
rtengine/procevents.h
View File

@ -774,6 +774,7 @@ enum ProcEventCode {
Evlocallabfatanchor = 744, Evlocallabfatanchor = 744,
Evlocallabfatlevel = 745, Evlocallabfatlevel = 745,
EvLocallabSpotCreated = 746, EvLocallabSpotCreated = 746,
EvlocallabexnoiseMethod = 747,
NUMOFEVENTS NUMOFEVENTS
}; };

4
rtengine/procparams.cc
View File

@ -2487,6 +2487,7 @@ LocallabParams::LocallabSpot::LocallabSpot() :
slomaskexp(0.0), slomaskexp(0.0),
softradiusexp(0.0), softradiusexp(0.0),
expMethod("std"), expMethod("std"),
exnoiseMethod("none"),
laplacexp(0.0), laplacexp(0.0),
balanexp(0.75), balanexp(0.75),
linear(0.3), linear(0.3),
@ -2747,6 +2748,7 @@ bool LocallabParams::LocallabSpot::operator ==(const LocallabSpot& other) const
&& slomaskexp == other.slomaskexp && slomaskexp == other.slomaskexp
&& softradiusexp == other.softradiusexp && softradiusexp == other.softradiusexp
&& expMethod == other.expMethod && expMethod == other.expMethod
&& exnoiseMethod == other.exnoiseMethod
&& laplacexp == other.laplacexp && laplacexp == other.laplacexp
&& balanexp == other.balanexp && balanexp == other.balanexp
&& linear == other.linear && linear == other.linear
@ -3990,6 +3992,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || pedited->locallab.spots.at(i).slomaskexp, "Locallab", "Slomaskexp_" + std::to_string(i), spot.slomaskexp, keyFile); saveToKeyfile(!pedited || pedited->locallab.spots.at(i).slomaskexp, "Locallab", "Slomaskexp_" + std::to_string(i), spot.slomaskexp, keyFile);
saveToKeyfile(!pedited || pedited->locallab.spots.at(i).softradiusexp, "Locallab", "Softradiusexp_" + std::to_string(i), spot.softradiusexp, keyFile); saveToKeyfile(!pedited || pedited->locallab.spots.at(i).softradiusexp, "Locallab", "Softradiusexp_" + std::to_string(i), spot.softradiusexp, keyFile);
saveToKeyfile(!pedited || pedited->locallab.spots.at(i).expMethod, "Locallab", "ExpMethod_" + std::to_string(i), spot.expMethod, keyFile); saveToKeyfile(!pedited || pedited->locallab.spots.at(i).expMethod, "Locallab", "ExpMethod_" + std::to_string(i), spot.expMethod, keyFile);
saveToKeyfile(!pedited || pedited->locallab.spots.at(i).exnoiseMethod, "Locallab", "ExnoiseMethod_" + std::to_string(i), spot.exnoiseMethod, keyFile);
saveToKeyfile(!pedited || pedited->locallab.spots.at(i).laplacexp, "Locallab", "Laplacexp_" + std::to_string(i), spot.laplacexp, keyFile); saveToKeyfile(!pedited || pedited->locallab.spots.at(i).laplacexp, "Locallab", "Laplacexp_" + std::to_string(i), spot.laplacexp, keyFile);
saveToKeyfile(!pedited || pedited->locallab.spots.at(i).balanexp, "Locallab", "Balanexp_" + std::to_string(i), spot.balanexp, keyFile); saveToKeyfile(!pedited || pedited->locallab.spots.at(i).balanexp, "Locallab", "Balanexp_" + std::to_string(i), spot.balanexp, keyFile);
saveToKeyfile(!pedited || pedited->locallab.spots.at(i).linear, "Locallab", "Linearexp_" + std::to_string(i), spot.linear, keyFile); saveToKeyfile(!pedited || pedited->locallab.spots.at(i).linear, "Locallab", "Linearexp_" + std::to_string(i), spot.linear, keyFile);
@ -5350,6 +5353,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "Locallab", "Slomaskexp_" + std::to_string(i), pedited, spot.slomaskexp, spotEdited.slomaskexp); assignFromKeyfile(keyFile, "Locallab", "Slomaskexp_" + std::to_string(i), pedited, spot.slomaskexp, spotEdited.slomaskexp);
assignFromKeyfile(keyFile, "Locallab", "Softradiusexp_" + std::to_string(i), pedited, spot.softradiusexp, spotEdited.softradiusexp); assignFromKeyfile(keyFile, "Locallab", "Softradiusexp_" + std::to_string(i), pedited, spot.softradiusexp, spotEdited.softradiusexp);
assignFromKeyfile(keyFile, "Locallab", "ExpMethod_" + std::to_string(i), pedited, spot.expMethod, spotEdited.expMethod); assignFromKeyfile(keyFile, "Locallab", "ExpMethod_" + std::to_string(i), pedited, spot.expMethod, spotEdited.expMethod);
assignFromKeyfile(keyFile, "Locallab", "ExnoiseMethod_" + std::to_string(i), pedited, spot.exnoiseMethod, spotEdited.exnoiseMethod);
assignFromKeyfile(keyFile, "Locallab", "Laplacexp_" + std::to_string(i), pedited, spot.laplacexp, spotEdited.laplacexp); assignFromKeyfile(keyFile, "Locallab", "Laplacexp_" + std::to_string(i), pedited, spot.laplacexp, spotEdited.laplacexp);
assignFromKeyfile(keyFile, "Locallab", "Balanexp_" + std::to_string(i), pedited, spot.balanexp, spotEdited.balanexp); assignFromKeyfile(keyFile, "Locallab", "Balanexp_" + std::to_string(i), pedited, spot.balanexp, spotEdited.balanexp);
assignFromKeyfile(keyFile, "Locallab", "Linearexp_" + std::to_string(i), pedited, spot.linear, spotEdited.linear); assignFromKeyfile(keyFile, "Locallab", "Linearexp_" + std::to_string(i), pedited, spot.linear, spotEdited.linear);

1
rtengine/procparams.h
View File

@ -1037,6 +1037,7 @@ struct LocallabParams {
double slomaskexp; double slomaskexp;
double softradiusexp; double softradiusexp;
Glib::ustring expMethod; Glib::ustring expMethod;
Glib::ustring exnoiseMethod;
double laplacexp; double laplacexp;
double balanexp; double balanexp;
double linear; double linear;

3
rtengine/refreshmap.cc
View File

@ -773,7 +773,8 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
LUMINANCECURVE, //Evlocallabfatdetail LUMINANCECURVE, //Evlocallabfatdetail
LUMINANCECURVE, //Evlocallabfatanchor LUMINANCECURVE, //Evlocallabfatanchor
LUMINANCECURVE, //Evlocallabfatlevel LUMINANCECURVE, //Evlocallabfatlevel
LUMINANCECURVE //EvlocallabSpotCreated LUMINANCECURVE, //EvlocallabSpotCreated
LUMINANCECURVE // EvlocallabexnoiseMethod
}; };

71
rtgui/locallab.cc
View File

@ -374,6 +374,7 @@ Locallab::Locallab():
showmaskexpMethod(Gtk::manage(new MyComboBoxText())), showmaskexpMethod(Gtk::manage(new MyComboBoxText())),
showmaskexpMethodinv(Gtk::manage(new MyComboBoxText())), showmaskexpMethodinv(Gtk::manage(new MyComboBoxText())),
expMethod(Gtk::manage(new MyComboBoxText())), expMethod(Gtk::manage(new MyComboBoxText())),
exnoiseMethod(Gtk::manage(new MyComboBoxText())),
//Shadows Highlight //Shadows Highlight
showmaskSHMethod(Gtk::manage(new MyComboBoxText())), showmaskSHMethod(Gtk::manage(new MyComboBoxText())),
showmaskSHMethodinv(Gtk::manage(new MyComboBoxText())), showmaskSHMethodinv(Gtk::manage(new MyComboBoxText())),
@ -687,6 +688,23 @@ Locallab::Locallab():
expMethod->set_tooltip_text(M("TP_LOCALLAB_EXPMETHOD_TOOLTIP")); expMethod->set_tooltip_text(M("TP_LOCALLAB_EXPMETHOD_TOOLTIP"));
} }
ctboxexpmethod = Gtk::manage(new Gtk::HBox());
Gtk::Label* const labelexpmethod = Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_NOISEMETH") + ":"));
ctboxexpmethod->pack_start(*labelexpmethod, Gtk::PACK_SHRINK, 4);
exnoiseMethod->append(M("TP_LOCALLAB_NONENOISE"));
exnoiseMethod->append(M("TP_LOCALLAB_MEDIAN"));
exnoiseMethod->append(M("TP_LOCALLAB_WAVLOW"));
exnoiseMethod->append(M("TP_LOCALLAB_WAVMED"));
exnoiseMethod->append(M("TP_LOCALLAB_WAVHIGH"));
exnoiseMethod->set_active(0);
exnoiseMethodConn = exnoiseMethod->signal_changed().connect(sigc::mem_fun(*this, &Locallab::exnoiseMethodChanged));
if (showtooltip) {
exnoiseMethod->set_tooltip_text(M("TP_LOCALLAB_EXPMETHOD_TOOLTIP"));
}
ctboxexpmethod->pack_start(*exnoiseMethod);
setExpandAlignProperties(expmaskexp, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START); setExpandAlignProperties(expmaskexp, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
expmaskexp->signal_button_release_event().connect_notify(sigc::bind(sigc::mem_fun(this, &Locallab::foldAllButMe), expmaskexp)); expmaskexp->signal_button_release_event().connect_notify(sigc::bind(sigc::mem_fun(this, &Locallab::foldAllButMe), expmaskexp));
expmaskexp->setLevel(2); expmaskexp->setLevel(2);
@ -825,6 +843,7 @@ Locallab::Locallab():
pdeBox->pack_start(*linear); pdeBox->pack_start(*linear);
pdeBox->pack_start(*balanexp); pdeBox->pack_start(*balanexp);
pdeBox->pack_start(*gamm); pdeBox->pack_start(*gamm);
pdeBox->pack_start(*ctboxexpmethod);
fatFrame->set_label_align(0.025, 0.5); fatFrame->set_label_align(0.025, 0.5);
if (showtooltip) { if (showtooltip) {
@ -2838,6 +2857,18 @@ void Locallab::write(ProcParams* pp, ParamsEdited* pedited)
pp->locallab.spots.at(pp->locallab.selspot).expMethod = "pde"; pp->locallab.spots.at(pp->locallab.selspot).expMethod = "pde";
} }
if (exnoiseMethod->get_active_row_number() == 0) {
pp->locallab.spots.at(pp->locallab.selspot).exnoiseMethod = "none";
} else if (exnoiseMethod->get_active_row_number() == 1) {
pp->locallab.spots.at(pp->locallab.selspot).exnoiseMethod = "med";
} else if (exnoiseMethod->get_active_row_number() == 2) {
pp->locallab.spots.at(pp->locallab.selspot).exnoiseMethod = "wavlo";
} else if (exnoiseMethod->get_active_row_number() == 3) {
pp->locallab.spots.at(pp->locallab.selspot).exnoiseMethod = "wavme";
} else if (exnoiseMethod->get_active_row_number() == 4) {
pp->locallab.spots.at(pp->locallab.selspot).exnoiseMethod = "wavhi";
}
pp->locallab.spots.at(pp->locallab.selspot).laplacexp = laplacexp->getValue(); pp->locallab.spots.at(pp->locallab.selspot).laplacexp = laplacexp->getValue();
pp->locallab.spots.at(pp->locallab.selspot).balanexp = balanexp->getValue(); pp->locallab.spots.at(pp->locallab.selspot).balanexp = balanexp->getValue();
pp->locallab.spots.at(pp->locallab.selspot).linear = linear->getValue(); pp->locallab.spots.at(pp->locallab.selspot).linear = linear->getValue();
@ -3145,6 +3176,7 @@ void Locallab::write(ProcParams* pp, ParamsEdited* pedited)
pe->locallab.spots.at(pp->locallab.selspot).slomaskexp = pe->locallab.spots.at(pp->locallab.selspot).slomaskexp || slomaskexp->getEditedState(); pe->locallab.spots.at(pp->locallab.selspot).slomaskexp = pe->locallab.spots.at(pp->locallab.selspot).slomaskexp || slomaskexp->getEditedState();
pe->locallab.spots.at(pp->locallab.selspot).softradiusexp = pe->locallab.spots.at(pp->locallab.selspot).softradiusexp || softradiusexp->getEditedState(); pe->locallab.spots.at(pp->locallab.selspot).softradiusexp = pe->locallab.spots.at(pp->locallab.selspot).softradiusexp || softradiusexp->getEditedState();
pe->locallab.spots.at(pp->locallab.selspot).expMethod = pe->locallab.spots.at(pp->locallab.selspot).expMethod || expMethod->get_active_text() != M("GENERAL_UNCHANGED"); pe->locallab.spots.at(pp->locallab.selspot).expMethod = pe->locallab.spots.at(pp->locallab.selspot).expMethod || expMethod->get_active_text() != M("GENERAL_UNCHANGED");
pe->locallab.spots.at(pp->locallab.selspot).exnoiseMethod = pe->locallab.spots.at(pp->locallab.selspot).exnoiseMethod || exnoiseMethod->get_active_text() != M("GENERAL_UNCHANGED");
pe->locallab.spots.at(pp->locallab.selspot).laplacexp = pe->locallab.spots.at(pp->locallab.selspot).laplacexp || laplacexp->getEditedState(); pe->locallab.spots.at(pp->locallab.selspot).laplacexp = pe->locallab.spots.at(pp->locallab.selspot).laplacexp || laplacexp->getEditedState();
pe->locallab.spots.at(pp->locallab.selspot).balanexp = pe->locallab.spots.at(pp->locallab.selspot).balanexp || balanexp->getEditedState(); pe->locallab.spots.at(pp->locallab.selspot).balanexp = pe->locallab.spots.at(pp->locallab.selspot).balanexp || balanexp->getEditedState();
pe->locallab.spots.at(pp->locallab.selspot).linear = pe->locallab.spots.at(pp->locallab.selspot).linear || linear->getEditedState(); pe->locallab.spots.at(pp->locallab.selspot).linear = pe->locallab.spots.at(pp->locallab.selspot).linear || linear->getEditedState();
@ -3409,6 +3441,7 @@ void Locallab::write(ProcParams* pp, ParamsEdited* pedited)
pedited->locallab.spots.at(pp->locallab.selspot).slomaskexp = pedited->locallab.spots.at(pp->locallab.selspot).slomaskexp || slomaskexp->getEditedState(); pedited->locallab.spots.at(pp->locallab.selspot).slomaskexp = pedited->locallab.spots.at(pp->locallab.selspot).slomaskexp || slomaskexp->getEditedState();
pedited->locallab.spots.at(pp->locallab.selspot).softradiusexp = pedited->locallab.spots.at(pp->locallab.selspot).softradiusexp || softradiusexp->getEditedState(); pedited->locallab.spots.at(pp->locallab.selspot).softradiusexp = pedited->locallab.spots.at(pp->locallab.selspot).softradiusexp || softradiusexp->getEditedState();
pedited->locallab.spots.at(pp->locallab.selspot).expMethod = pedited->locallab.spots.at(pp->locallab.selspot).expMethod || expMethod->get_active_text() != M("GENERAL_UNCHANGED"); pedited->locallab.spots.at(pp->locallab.selspot).expMethod = pedited->locallab.spots.at(pp->locallab.selspot).expMethod || expMethod->get_active_text() != M("GENERAL_UNCHANGED");
pedited->locallab.spots.at(pp->locallab.selspot).exnoiseMethod = pedited->locallab.spots.at(pp->locallab.selspot).exnoiseMethod || exnoiseMethod->get_active_text() != M("GENERAL_UNCHANGED");
pedited->locallab.spots.at(pp->locallab.selspot).laplacexp = pedited->locallab.spots.at(pp->locallab.selspot).laplacexp || laplacexp->getEditedState(); pedited->locallab.spots.at(pp->locallab.selspot).laplacexp = pedited->locallab.spots.at(pp->locallab.selspot).laplacexp || laplacexp->getEditedState();
pedited->locallab.spots.at(pp->locallab.selspot).balanexp = pedited->locallab.spots.at(pp->locallab.selspot).balanexp || balanexp->getEditedState(); pedited->locallab.spots.at(pp->locallab.selspot).balanexp = pedited->locallab.spots.at(pp->locallab.selspot).balanexp || balanexp->getEditedState();
pedited->locallab.spots.at(pp->locallab.selspot).linear = pedited->locallab.spots.at(pp->locallab.selspot).linear || linear->getEditedState(); pedited->locallab.spots.at(pp->locallab.selspot).linear = pedited->locallab.spots.at(pp->locallab.selspot).linear || linear->getEditedState();
@ -4182,7 +4215,18 @@ void Locallab::expMethodChanged()
if (getEnabled() && expexpose->getEnabled()) { if (getEnabled() && expexpose->getEnabled()) {
if (listener) { if (listener) {
listener->panelChanged(EvlocallabexpMethod, ""); listener->panelChanged(EvlocallabexpMethod, expMethod->get_active_text());
}
}
}
void Locallab::exnoiseMethodChanged()
{
if (getEnabled() && expexpose->getEnabled()) {
if (listener) {
listener->panelChanged(EvlocallabexnoiseMethod, exnoiseMethod->get_active_text() );
} }
} }
} }
@ -4677,6 +4721,7 @@ void Locallab::inversexChanged()
blurexpde->show(); blurexpde->show();
shadex->show(); shadex->show();
expMethod->show(); expMethod->show();
exnoiseMethod->show();
if (expMethod->get_active_row_number() == 0) { if (expMethod->get_active_row_number() == 0) {
pdeFrame->hide(); pdeFrame->hide();
@ -4701,6 +4746,7 @@ void Locallab::inversexChanged()
blurexpde->show(); blurexpde->show();
softradiusexp->hide(); softradiusexp->hide();
expMethod->hide(); expMethod->hide();
exnoiseMethod->hide();
showmaskexpMethod->hide(); showmaskexpMethod->hide();
showmaskexpMethodinv->show(); showmaskexpMethodinv->show();
@ -4723,6 +4769,7 @@ void Locallab::inversexChanged()
softradiusexp->show(); softradiusexp->show();
shadex->show(); shadex->show();
expMethod->show(); expMethod->show();
exnoiseMethod->show();
if (expMethod->get_active_row_number() == 0) { if (expMethod->get_active_row_number() == 0) {
pdeFrame->hide(); pdeFrame->hide();
@ -6751,6 +6798,7 @@ void Locallab::setBatchMode(bool batchMode)
gridMethod->append(M("GENERAL_UNCHANGED")); gridMethod->append(M("GENERAL_UNCHANGED"));
//exposure //exposure
expMethod->append(M("GENERAL_UNCHANGED")); expMethod->append(M("GENERAL_UNCHANGED"));
exnoiseMethod->append(M("GENERAL_UNCHANGED"));
// softlight // softlight
softMethod->append(M("GENERAL_UNCHANGED")); softMethod->append(M("GENERAL_UNCHANGED"));
// Blur & Noise // Blur & Noise
@ -6924,6 +6972,7 @@ void Locallab::enableListener()
showmaskexpMethodConn.block(false); showmaskexpMethodConn.block(false);
showmaskexpMethodConninv.block(false); showmaskexpMethodConninv.block(false);
expMethodConn.block(false); expMethodConn.block(false);
exnoiseMethodConn.block(false);
enaExpMaskConn.block(false); enaExpMaskConn.block(false);
// Shadow highlight // Shadow highlight
enableshadhighConn.block(false); enableshadhighConn.block(false);
@ -6997,6 +7046,7 @@ void Locallab::disableListener()
showmaskexpMethodConn.block(true); showmaskexpMethodConn.block(true);
showmaskexpMethodConninv.block(true); showmaskexpMethodConninv.block(true);
expMethodConn.block(true); expMethodConn.block(true);
exnoiseMethodConn.block(true);
enaExpMaskConn.block(true); enaExpMaskConn.block(true);
// Shadow highlight // Shadow highlight
enableshadhighConn.block(true); enableshadhighConn.block(true);
@ -7138,6 +7188,18 @@ void Locallab::updateLocallabGUI(const rtengine::procparams::ProcParams* pp, con
expMethod->set_active(1); expMethod->set_active(1);
} }
if (pp->locallab.spots.at(index).exnoiseMethod == "one") {
exnoiseMethod->set_active(0);
} else if (pp->locallab.spots.at(index).exnoiseMethod == "med") {
exnoiseMethod->set_active(1);
} else if (pp->locallab.spots.at(index).exnoiseMethod == "wavlo") {
exnoiseMethod->set_active(2);
} else if (pp->locallab.spots.at(index).exnoiseMethod == "wavme") {
exnoiseMethod->set_active(3);
} else if (pp->locallab.spots.at(index).exnoiseMethod == "wavhi") {
exnoiseMethod->set_active(4);
}
laplacexp->setValue(pp->locallab.spots.at(index).laplacexp); laplacexp->setValue(pp->locallab.spots.at(index).laplacexp);
balanexp->setValue(pp->locallab.spots.at(index).balanexp); balanexp->setValue(pp->locallab.spots.at(index).balanexp);
linear->setValue(pp->locallab.spots.at(index).linear); linear->setValue(pp->locallab.spots.at(index).linear);
@ -7473,6 +7535,10 @@ void Locallab::updateLocallabGUI(const rtengine::procparams::ProcParams* pp, con
expMethod->set_active_text(M("GENERAL_UNCHANGED")); expMethod->set_active_text(M("GENERAL_UNCHANGED"));
} }
if (!spotState->exnoiseMethod) {
exnoiseMethod->set_active_text(M("GENERAL_UNCHANGED"));
}
laplacexp->setEditedState(spotState->laplacexp ? Edited : UnEdited); laplacexp->setEditedState(spotState->laplacexp ? Edited : UnEdited);
balanexp->setEditedState(spotState->balanexp ? Edited : UnEdited); balanexp->setEditedState(spotState->balanexp ? Edited : UnEdited);
linear->setEditedState(spotState->linear ? Edited : UnEdited); linear->setEditedState(spotState->linear ? Edited : UnEdited);
@ -7740,6 +7806,7 @@ void Locallab::updateSpecificGUIState()
shadex->show(); shadex->show();
expMethod->show(); expMethod->show();
expmaskexp->show(); expmaskexp->show();
exnoiseMethod->show();
if (expMethod->get_active_row_number() == 0) { if (expMethod->get_active_row_number() == 0) {
pdeFrame->hide(); pdeFrame->hide();
@ -7758,6 +7825,7 @@ void Locallab::updateSpecificGUIState()
softradiusexp->hide(); softradiusexp->hide();
shadex->hide(); shadex->hide();
expMethod->hide(); expMethod->hide();
exnoiseMethod->hide();
pdeFrame->hide(); pdeFrame->hide();
fatFrame->hide(); fatFrame->hide();
expmaskexp->show(); expmaskexp->show();
@ -7779,6 +7847,7 @@ void Locallab::updateSpecificGUIState()
softradiusexp->show(); softradiusexp->show();
shadex->show(); shadex->show();
expMethod->show(); expMethod->show();
exnoiseMethod->show();
expmaskexp->show(); expmaskexp->show();
showmaskexpMethodinv->hide(); showmaskexpMethodinv->hide();
showmaskexpMethod->show(); showmaskexpMethod->show();

4
rtgui/locallab.h
View File

@ -350,6 +350,8 @@ private:
sigc::connection showmaskexpMethodConninv; sigc::connection showmaskexpMethodConninv;
MyComboBoxText* const expMethod; MyComboBoxText* const expMethod;
sigc::connection expMethodConn; sigc::connection expMethodConn;
MyComboBoxText* const exnoiseMethod;
sigc::connection exnoiseMethodConn;
//Shadows Highlight //Shadows Highlight
MyComboBoxText* const showmaskSHMethod; MyComboBoxText* const showmaskSHMethod;
sigc::connection showmaskSHMethodConn; sigc::connection showmaskSHMethodConn;
@ -402,6 +404,7 @@ private:
LabGrid *labgrid; LabGrid *labgrid;
// Others // Others
Gtk::HBox* ctboxsoftmethod; Gtk::HBox* ctboxsoftmethod;
Gtk::HBox* ctboxexpmethod;
/** /**
* Used to store the default ProcParams when setDefaults function is called * Used to store the default ProcParams when setDefaults function is called
* When an other spot is selected, this default ProcParams is used to update adjusters default values * When an other spot is selected, this default ProcParams is used to update adjusters default values
@ -465,6 +468,7 @@ private:
void showmaskexpMethodChanged(); void showmaskexpMethodChanged();
void showmaskexpMethodChangedinv(); void showmaskexpMethodChangedinv();
void expMethodChanged(); void expMethodChanged();
void exnoiseMethodChanged();
//Shadows Highlight //Shadows Highlight
void showmaskSHMethodChanged(); void showmaskSHMethodChanged();
void showmaskSHMethodChangedinv(); void showmaskSHMethodChangedinv();

7
rtgui/paramsedited.cc
View File

@ -1027,6 +1027,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
locallab.spots.at(j).slomaskexp = locallab.spots.at(j).slomaskexp && pSpot.slomaskexp == otherSpot.slomaskexp; locallab.spots.at(j).slomaskexp = locallab.spots.at(j).slomaskexp && pSpot.slomaskexp == otherSpot.slomaskexp;
locallab.spots.at(j).softradiusexp = locallab.spots.at(j).softradiusexp && pSpot.softradiusexp == otherSpot.softradiusexp; locallab.spots.at(j).softradiusexp = locallab.spots.at(j).softradiusexp && pSpot.softradiusexp == otherSpot.softradiusexp;
locallab.spots.at(j).expMethod = locallab.spots.at(j).expMethod && pSpot.expMethod == otherSpot.expMethod; locallab.spots.at(j).expMethod = locallab.spots.at(j).expMethod && pSpot.expMethod == otherSpot.expMethod;
locallab.spots.at(j).exnoiseMethod = locallab.spots.at(j).exnoiseMethod && pSpot.exnoiseMethod == otherSpot.exnoiseMethod;
locallab.spots.at(j).laplacexp = locallab.spots.at(j).laplacexp && pSpot.laplacexp == otherSpot.laplacexp; locallab.spots.at(j).laplacexp = locallab.spots.at(j).laplacexp && pSpot.laplacexp == otherSpot.laplacexp;
locallab.spots.at(j).balanexp = locallab.spots.at(j).balanexp && pSpot.balanexp == otherSpot.balanexp; locallab.spots.at(j).balanexp = locallab.spots.at(j).balanexp && pSpot.balanexp == otherSpot.balanexp;
locallab.spots.at(j).linear = locallab.spots.at(j).linear && pSpot.linear == otherSpot.linear; locallab.spots.at(j).linear = locallab.spots.at(j).linear && pSpot.linear == otherSpot.linear;
@ -2972,6 +2973,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.locallab.spots.at(i).expMethod = mods.locallab.spots.at(i).expMethod; toEdit.locallab.spots.at(i).expMethod = mods.locallab.spots.at(i).expMethod;
} }
if (locallab.spots.at(i).exnoiseMethod) {
toEdit.locallab.spots.at(i).exnoiseMethod = mods.locallab.spots.at(i).exnoiseMethod;
}
if (locallab.spots.at(i).laplacexp) { if (locallab.spots.at(i).laplacexp) {
toEdit.locallab.spots.at(i).laplacexp = mods.locallab.spots.at(i).laplacexp; toEdit.locallab.spots.at(i).laplacexp = mods.locallab.spots.at(i).laplacexp;
} }
@ -4676,6 +4681,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) :
slomaskexp(v), slomaskexp(v),
softradiusexp(v), softradiusexp(v),
expMethod(v), expMethod(v),
exnoiseMethod(v),
laplacexp(v), laplacexp(v),
balanexp(v), balanexp(v),
linear(v), linear(v),
@ -4933,6 +4939,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v)
slomaskexp = v; slomaskexp = v;
softradiusexp = v; softradiusexp = v;
expMethod = v; expMethod = v;
exnoiseMethod = v;
laplacexp = v; laplacexp = v;
balanexp = v; balanexp = v;
linear = v; linear = v;

1
rtgui/paramsedited.h
View File

@ -447,6 +447,7 @@ public:
bool slomaskexp; bool slomaskexp;
bool softradiusexp; bool softradiusexp;
bool expMethod; bool expMethod;
bool exnoiseMethod;
bool laplacexp; bool laplacexp;
bool balanexp; bool balanexp;
bool linear; bool linear;