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

Improve and clean code

Browse Source
This commit is contained in:
Desmis 2020-06-09 11:00:48 +02:00
parent d3538fb230
commit ad48610dfb
3 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rtengine/ipwavelet.cc
View File

@ -3726,8 +3726,8 @@ void ImProcFunctions::ContAllL(float *koeLi[12], float *maxkoeLi, bool lipschitz
float bbbrS = 1.f - cp.b_rsl * aaarS; float bbbrS = 1.f - cp.b_rsl * aaarS;
if (level <= cp.numlevH) { //in function of levels if (level <= cp.numlevH) { //in function of levels
// float klevred = 2.f * (waOpacityCurveSH[level * 55.5f] - 0.5f); // float klevred = 2.f * (waOpacityCurveSH[level * 55.5f] - 0.5f);
// if(klevred > 0.f && level <= 6) {// level < 6 to avoid bad use of the curve if user put negative values positives // if(klevred > 0.f && level <= 6) {// level < 6 to avoid bad use of the curve if user put negative values positives
if ((LL100 > cp.t_lhl * kH[level] && LL100 < cp.t_rhl * kH[level])) { if ((LL100 > cp.t_lhl * kH[level] && LL100 < cp.t_rhl * kH[level])) {
kLlevH = alpha; kLlevH = alpha;
} else if ((LL100 > cp.b_lhl * kH[level] && LL100 <= cp.t_lhl * kH[level])) { } else if ((LL100 > cp.b_lhl * kH[level] && LL100 <= cp.t_lhl * kH[level])) {
@ -3737,12 +3737,12 @@ void ImProcFunctions::ContAllL(float *koeLi[12], float *maxkoeLi, bool lipschitz
} else { } else {
kLlevH = 1.f; kLlevH = 1.f;
} }
// kLlevH = 1.f + (kLlevH - 1.f) * klevred; // kLlevH = 1.f + (kLlevH - 1.f) * klevred;
// kLlevH = 1.f + (kLlevH - 1.f); // kLlevH = 1.f + (kLlevH - 1.f);
} }
if (level >= (9 - cp.numlevS)) { if (level >= (9 - cp.numlevS)) {
// if(klevred < 0.f && level >= 3) {//level > 3 to avoid bad use of the curve if user put positives values negatives // if(klevred < 0.f && level >= 3) {//level > 3 to avoid bad use of the curve if user put positives values negatives
if ((LL100 > cp.t_lsl && LL100 < cp.t_rsl)) { if ((LL100 > cp.t_lsl && LL100 < cp.t_rsl)) {
kLlevS = alpha; kLlevS = alpha;
} else if ((LL100 > cp.b_lsl && LL100 <= cp.t_lsl)) { } else if ((LL100 > cp.b_lsl && LL100 <= cp.t_lsl)) {
@ -3752,7 +3752,7 @@ void ImProcFunctions::ContAllL(float *koeLi[12], float *maxkoeLi, bool lipschitz
} else { } else {
kLlevS = 1.f; kLlevS = 1.f;
} }
// kLlevS = 1.f - (kLlevS - 1.f) * klevred; // kLlevS = 1.f - (kLlevS - 1.f) * klevred;
} }
} else { } else {

39
rtengine/procparams.cc
View File

@ -2194,6 +2194,42 @@ WaveletParams::WaveletParams() :
0.35, 0.35,
0.35 0.35
}, },
opacityCurveSH{
static_cast<double>(FCT_MinMaxCPoints),
0.,
1.,
0.35,
0.35,
0.15,
0.9,
0.35,
0.35,
0.4,
0.8,
0.35,
0.35,
0.4,
0.5,
0.35,
0.35,
0.5,
0.5,
0.35,
0.35,
0.5,
0.2,
0.35,
0.35,
0.8,
0.1,
0.35,
0.35,
1.0,
0.,
0.35,
0.35
},
/*
opacityCurveSH{ opacityCurveSH{
static_cast<double>(FCT_MinMaxCPoints), static_cast<double>(FCT_MinMaxCPoints),
0.0, 0.0,
@ -2213,6 +2249,7 @@ WaveletParams::WaveletParams() :
0.35, 0.35,
0.35 0.35
}, },
*/
opacityCurveBY{ opacityCurveBY{
static_cast<double>(FCT_MinMaxCPoints), static_cast<double>(FCT_MinMaxCPoints),
0.0, 0.0,
@ -2343,7 +2380,7 @@ WaveletParams::WaveletParams() :
thres(7), thres(7),
chroma(5), chroma(5),
chro(0), chro(0),
threshold(5), threshold(4),
threshold2(5), threshold2(5),
edgedetect(90), edgedetect(90),
edgedetectthr(20), edgedetectthr(20),

7
rtgui/wavelet.cc
View File

@ -1165,11 +1165,8 @@ void Wavelet::updateGUI()
{ {
const int temp2 = threshold2->getValue(); const int temp2 = threshold2->getValue();
const int temp = threshold->getValue(); const int temp = threshold->getValue();
int tempmax = temp + 1; const int tempmax = (temp + 1) > 9 ? 9 : temp + 1;
if(tempmax > 9) { threshold2->setLimits(temp, 9, 1, tempmax);
tempmax = 9;
}
threshold2->setLimits(temp, 9, 1, temp + 1);
threshold2 ->setValue(temp2); threshold2 ->setValue(temp2);
} }