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

Merge of new Locallab GUI with existing Locallab engine

Browse Source 
New Locallab GUI has now impacts on image

Bug fixes:
- Some tools GUI were not updated accordingly if they were not firstly
activated
- Image was not activated if a control spot was deleted
- Blur & Noise GUI was not updated according to blurMethod combobox
This commit is contained in:
Pandagrapher
2018-08-23 21:38:59 +02:00
parent 9d18ccc585
commit 757cf784f2
10 changed files with 996 additions and 5714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

340
rtengine/ipretinex.cc
View File

@@ -802,10 +802,8 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, float **e
}
}
void ImProcFunctions::MSRLocal(float** luminance, float** templ, const float* const *originalLuminance, const int width, const int height, const LocallabParams &loc, const int skip, const LocretigainCurve &locRETgainCcurve, const int chrome, const int scall, const float krad, float &minCD, float &maxCD, float &mini, float &maxi, float &Tmean, float &Tsigma, float &Tmin, float &Tmax)
void ImProcFunctions::MSRLocal(int sp, float** luminance, float** templ, const float* const *originalLuminance, const int width, const int height, const LocallabParams &loc, const int skip, const LocretigainCurve &locRETgainCcurve, const int chrome, const int scall, const float krad, float &minCD, float &maxCD, float &mini, float &maxi, float &Tmean, float &Tsigma, float &Tmin, float &Tmax)
{
// TODO Locallab
/*
BENCHFUN
bool py = true;
@@ -816,10 +814,10 @@ void ImProcFunctions::MSRLocal(float** luminance, float** templ, const float* co
// constexpr bool useHsl = false; //never used
constexpr bool useHslLin = false;//never used
const float offse = 0.f; //loc.offs;
const float chrT = (float)(loc.chrrt) / 100.f;
const float chrT = (float)(loc.chrrt.at(sp)) / 100.f;
const int scal = scall;//3;//loc.scale;;
const float vart = loc.vart / 100.f;//variance
const float strength = loc.str / 100.f; // Blend with original L channel data
const float vart = loc.vart.at(sp) / 100.f;//variance
const float strength = loc.str.at(sp) / 100.f; // Blend with original L channel data
float limD = 10.f;//(float) loc.limd;
limD = pow(limD, 1.7f); //about 2500 enough
//limD *= useHslLin ? 10.f : 1.f;
@@ -828,7 +826,7 @@ void ImProcFunctions::MSRLocal(float** luminance, float** templ, const float* co
//empirical skip evaluation : very difficult because quasi all parameters interfere
//to test on several images
int nei = (int)(krad * loc.neigh);
int nei = (int)(krad * loc.neigh.at(sp));
if (skip >= 4) {
nei = (int)(0.1f * nei + 2.f); //not too bad
@@ -838,12 +836,12 @@ void ImProcFunctions::MSRLocal(float** luminance, float** templ, const float* co
int moderetinex = 0;
if (loc.retinexMethod == "uni") {
if (loc.retinexMethod.at(sp) == "uni") {
moderetinex = 0;
} else if (loc.retinexMethod == "low") {
} else if (loc.retinexMethod.at(sp) == "low") {
moderetinex = 1;
} else {
if (loc.retinexMethod == "high") { // default to 2 ( deh.retinexMethod == "high" )
if (loc.retinexMethod.at(sp) == "high") { // default to 2 ( deh.retinexMethod == "high" )
moderetinex = 2;
}
}
@@ -874,9 +872,9 @@ void ImProcFunctions::MSRLocal(float** luminance, float** templ, const float* co
const double shradius = mapmet == 4 ? 40 : 40.;
constexpr int it = 1;//in case of !!
#ifdef _OPENMP
#ifdef _OPENMP
#pragma omp parallel for
#endif
#endif
for (int i = 0; i < H_L; i++)
for (int j = 0; j < W_L; j++) {
@@ -903,9 +901,9 @@ void ImProcFunctions::MSRLocal(float** luminance, float** templ, const float* co
float *buffer = new float[W_L * H_L];
for (int scale = scal - 1; scale >= 0; scale--) {
#ifdef _OPENMP
#ifdef _OPENMP
#pragma omp parallel
#endif
#endif
{
if (scale == scal - 1)
@@ -916,9 +914,9 @@ void ImProcFunctions::MSRLocal(float** luminance, float** templ, const float* co
// out was modified in last iteration => restore it
if (((mapmet == 4)) && it == 1) {
#ifdef _OPENMP
#ifdef _OPENMP
#pragma omp for
#endif
#endif
for (int i = 0; i < H_L; i++) {
for (int j = 0; j < W_L; j++) {
@@ -933,9 +931,9 @@ void ImProcFunctions::MSRLocal(float** luminance, float** templ, const float* co
if ((mapmet == 4) && it == 1 && scale > 0)
{
// out will be modified => store it for use in next iteration. We even don't need a new buffer because 'buffer' is free after gaussianBlur :)
#ifdef _OPENMP
#ifdef _OPENMP
#pragma omp for
#endif
#endif
for (int i = 0; i < H_L; i++) {
for (int j = 0; j < W_L; j++) {
@@ -958,9 +956,9 @@ void ImProcFunctions::MSRLocal(float** luminance, float** templ, const float* co
if ((mapmet == 4) && it == 1) {
#ifdef _OPENMP
#ifdef _OPENMP
#pragma omp parallel for schedule(dynamic,16)
#endif
#endif
for (int i = 0; i < H_L; i++) {
for (int j = 0; j < W_L; j++) {
@@ -976,20 +974,20 @@ void ImProcFunctions::MSRLocal(float** luminance, float** templ, const float* co
}
#ifdef __SSE2__
#ifdef __SSE2__
vfloat pondv = F2V(pond);
vfloat limMinv = F2V(ilimD);
vfloat limMaxv = F2V(limD);
#endif
#ifdef _OPENMP
#endif
#ifdef _OPENMP
#pragma omp parallel for
#endif
#endif
for (int i = 0; i < H_L; i++) {
int j = 0;
#ifdef __SSE2__
#ifdef __SSE2__
if (useHslLin) { //keep in case of ??
for (; j < W_L - 3; j += 4) {
@@ -1001,7 +999,7 @@ void ImProcFunctions::MSRLocal(float** luminance, float** templ, const float* co
}
}
#endif
#endif
if (useHslLin) {
for (; j < W_L; j++) {
@@ -1069,173 +1067,173 @@ void ImProcFunctions::MSRLocal(float** luminance, float** templ, const float* co
// luminance[i][j] *= (-1.f + 4.f * wavRETCcurve[absciss]); //new transmission
}
*//*
// median filter on transmission ==> reduce artifacts
bool ty = false;
*/
// median filter on transmission ==> reduce artifacts
bool ty = false;
if (ty) {//not used here to simplify interface
int wid = W_L;
int hei = H_L;
float *tmL[hei] ALIGNED16;
float *tmLBuffer = new float[wid * hei];
int borderL = 1;
if (ty) {//not used here to simplify interface
int wid = W_L;
int hei = H_L;
float *tmL[hei] ALIGNED16;
float *tmLBuffer = new float[wid * hei];
int borderL = 1;
for (int i = 0; i < hei; i++) {
tmL[i] = &tmLBuffer[i * wid];
}
#ifdef _OPENMP
#pragma omp parallel for
#endif
for (int i = borderL; i < hei - borderL; i++) {
// float pp[9], temp;
for (int j = borderL; j < wid - borderL; j++) {
tmL[i][j] = median(luminance[i][j], luminance[i - 1][j], luminance[i + 1][j], luminance[i][j + 1], luminance[i][j - 1], luminance[i - 1][j - 1], luminance[i - 1][j + 1], luminance[i + 1][j - 1], luminance[i + 1][j + 1]); //3x3
for (int i = 0; i < hei; i++) {
tmL[i] = &tmLBuffer[i * wid];
}
}
#ifdef _OPENMP
#pragma omp parallel for
#pragma omp parallel for
#endif
for (int i = borderL; i < hei - borderL; i++) {
for (int j = borderL; j < wid - borderL; j++) {
luminance[i][j] = tmL[i][j];
}
}
for (int i = borderL; i < hei - borderL; i++) {
// float pp[9], temp;
delete [] tmLBuffer;
}
// I call mean_stddv2 instead of mean_stddv ==> logBetaGain
// mean_stddv( luminance, mean, stddv, W_L, H_L, 1.f, maxtr, mintr);
mean_stddv2(luminance, mean, stddv, W_L, H_L, maxtr, mintr);
}
float epsil = 0.1f;
mini = mean - vart * stddv;
if (mini < mintr) {
mini = mintr + epsil;
}
maxi = mean + vart * stddv;
if (maxi > maxtr) {
maxi = maxtr - epsil;
}
delta = maxi - mini;
//printf("maxi=%f mini=%f mean=%f std=%f delta=%f maxtr=%f mintr=%f\n", maxi, mini, mean, stddv, delta, maxtr, mintr);
if (!delta) {
delta = 1.0f;
}
float cdfactor = 32768.f / delta;
maxCD = -9999999.f;
minCD = 9999999.f;
//prepare work for curve gain
#ifdef _OPENMP
#pragma omp parallel for
#endif
for (int i = 0; i < H_L; i++) {
for (int j = 0; j < W_L; j++) {
luminance[i][j] = luminance[i][j] - mini;
}
}
mean = 0.f;
stddv = 0.f;
// I call mean_stddv2 instead of mean_stddv ==> logBetaGain
mean_stddv2(luminance, mean, stddv, W_L, H_L, maxtr, mintr);
float asig = 0.f, bsig = 0.f, amax = 0.f, bmax = 0.f, amin = 0.f, bmin = 0.f;
// bool gaincurve = false; //wavRETgainCcurve
const bool hasWavRetGainCurve = locRETgainCcurve && mean != 0.f && stddv != 0.f;
if (hasWavRetGainCurve) { //if curve
asig = 0.166666f / stddv;
bsig = 0.5f - asig * mean;
amax = 0.333333f / (maxtr - mean - stddv);
bmax = 1.f - amax * maxtr;
amin = 0.333333f / (mean - stddv - mintr);
bmin = -amin * mintr;
asig *= 500.f;
bsig *= 500.f;
amax *= 500.f;
bmax *= 500.f;
amin *= 500.f;
bmin *= 500.f;
cdfactor *= 2.f;
}
const float maxclip = (chrome == 0 ? 32768.f : 50000.f);
float str = strength * (chrome == 0 ? 1.f : chrT);
#ifdef _OPENMP
#pragma omp parallel
#endif
{
// float absciss;
float cdmax = -999999.f, cdmin = 999999.f;
float gan = 0.5f;
#ifdef _OPENMP
#pragma omp for schedule(dynamic,16)
#endif
for (int i = 0; i < H_L; i ++)
for (int j = 0; j < W_L; j++) {
if (hasWavRetGainCurve) {
float absciss;
if (LIKELY(fabsf(luminance[i][j] - mean) < stddv)) {
absciss = asig * luminance[i][j] + bsig;
} else if (luminance[i][j] >= mean) {
absciss = amax * luminance[i][j] + bmax;
} else {
absciss = amin * luminance[i][j] + bmin;
for (int j = borderL; j < wid - borderL; j++) {
tmL[i][j] = median(luminance[i][j], luminance[i - 1][j], luminance[i + 1][j], luminance[i][j + 1], luminance[i][j - 1], luminance[i - 1][j - 1], luminance[i - 1][j + 1], luminance[i + 1][j - 1], luminance[i + 1][j + 1]); //3x3
}
gan = locRETgainCcurve[absciss]; //new gain function transmission
}
float cd = gan * cdfactor * luminance[i][j] + offse;
#ifdef _OPENMP
#pragma omp parallel for
#endif
for (int i = borderL; i < hei - borderL; i++) {
for (int j = borderL; j < wid - borderL; j++) {
luminance[i][j] = tmL[i][j];
}
}
delete [] tmLBuffer;
cdmax = cd > cdmax ? cd : cdmax;
cdmin = cd < cdmin ? cd : cdmin;
luminance[i][j] = LIM(cd, 0.f, maxclip) * str + (1.f - str) * originalLuminance[i][j];
// templ[i][j] = LIM( cd, 0.f, maxclip ) * str + (1.f - str) * originalLuminance[i][j];
// luminance[i][j] = LIM( cd, 0.f, maxclip );
}
// I call mean_stddv2 instead of mean_stddv ==> logBetaGain
// mean_stddv( luminance, mean, stddv, W_L, H_L, 1.f, maxtr, mintr);
mean_stddv2(luminance, mean, stddv, W_L, H_L, maxtr, mintr);
}
float epsil = 0.1f;
mini = mean - vart * stddv;
if (mini < mintr) {
mini = mintr + epsil;
}
maxi = mean + vart * stddv;
if (maxi > maxtr) {
maxi = maxtr - epsil;
}
delta = maxi - mini;
//printf("maxi=%f mini=%f mean=%f std=%f delta=%f maxtr=%f mintr=%f\n", maxi, mini, mean, stddv, delta, maxtr, mintr);
if (!delta) {
delta = 1.0f;
}
float cdfactor = 32768.f / delta;
maxCD = -9999999.f;
minCD = 9999999.f;
//prepare work for curve gain
#ifdef _OPENMP
#pragma omp critical
#pragma omp parallel for
#endif
for (int i = 0; i < H_L; i++) {
for (int j = 0; j < W_L; j++) {
luminance[i][j] = luminance[i][j] - mini;
}
}
mean = 0.f;
stddv = 0.f;
// I call mean_stddv2 instead of mean_stddv ==> logBetaGain
mean_stddv2(luminance, mean, stddv, W_L, H_L, maxtr, mintr);
float asig = 0.f, bsig = 0.f, amax = 0.f, bmax = 0.f, amin = 0.f, bmin = 0.f;
// bool gaincurve = false; //wavRETgainCcurve
const bool hasWavRetGainCurve = locRETgainCcurve && mean != 0.f && stddv != 0.f;
if (hasWavRetGainCurve) { //if curve
asig = 0.166666f / stddv;
bsig = 0.5f - asig * mean;
amax = 0.333333f / (maxtr - mean - stddv);
bmax = 1.f - amax * maxtr;
amin = 0.333333f / (mean - stddv - mintr);
bmin = -amin * mintr;
asig *= 500.f;
bsig *= 500.f;
amax *= 500.f;
bmax *= 500.f;
amin *= 500.f;
bmin *= 500.f;
cdfactor *= 2.f;
}
const float maxclip = (chrome == 0 ? 32768.f : 50000.f);
float str = strength * (chrome == 0 ? 1.f : chrT);
#ifdef _OPENMP
#pragma omp parallel
#endif
{
maxCD = maxCD > cdmax ? maxCD : cdmax;
minCD = minCD < cdmin ? minCD : cdmin;
// float absciss;
float cdmax = -999999.f, cdmin = 999999.f;
float gan = 0.5f;
#ifdef _OPENMP
#pragma omp for schedule(dynamic,16)
#endif
for (int i = 0; i < H_L; i ++)
for (int j = 0; j < W_L; j++) {
if (hasWavRetGainCurve) {
float absciss;
if (LIKELY(fabsf(luminance[i][j] - mean) < stddv)) {
absciss = asig * luminance[i][j] + bsig;
} else if (luminance[i][j] >= mean) {
absciss = amax * luminance[i][j] + bmax;
} else {
absciss = amin * luminance[i][j] + bmin;
}
gan = locRETgainCcurve[absciss]; //new gain function transmission
}
float cd = gan * cdfactor * luminance[i][j] + offse;
cdmax = cd > cdmax ? cd : cdmax;
cdmin = cd < cdmin ? cd : cdmin;
luminance[i][j] = LIM(cd, 0.f, maxclip) * str + (1.f - str) * originalLuminance[i][j];
// templ[i][j] = LIM( cd, 0.f, maxclip ) * str + (1.f - str) * originalLuminance[i][j];
// luminance[i][j] = LIM( cd, 0.f, maxclip );
}
#ifdef _OPENMP
#pragma omp critical
#endif
{
maxCD = maxCD > cdmax ? maxCD : cdmax;
minCD = minCD < cdmin ? minCD : cdmin;
}
}
Tmean = mean;
Tsigma = stddv;
Tmin = mintr;
Tmax = maxtr;
}
Tmean = mean;
Tsigma = stddv;
Tmin = mintr;
Tmax = maxtr;
}
*/
}
}