diff --git a/rtdata/languages/default b/rtdata/languages/default
index f9c89888a..3bb511d2b 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -784,6 +784,7 @@ HISTORY_MSG_WAVSOFTRADEND;Soft radius final
HISTORY_MSG_WAVSHOWMASK;Show wavelet mask
HISTORY_MSG_WAVEDGS;Edge stopping
HISTORY_MSG_WAVSCALE;Scale
+HISTORY_MSG_WAVRADIUS;Radius Shadows-Highlight
HISTORY_NEWSNAPSHOT;Add
HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s
HISTORY_SNAPSHOT;Snapshot
@@ -2202,6 +2203,7 @@ TP_WAVELET_OPACITYWL;Final local contrast
TP_WAVELET_OPACITYWL_TOOLTIP;Modify the final local contrast at the end of the wavelet treatment.\n\nThe left side represents the smallest local contrast, progressing to the largest local contrast on the right.
TP_WAVELET_PASTEL;Pastel chroma
TP_WAVELET_PROC;Process
+TP_WAVELET_RADIUS;Radius Shadows - Highlight
TP_WAVELET_RE1;Reinforced
TP_WAVELET_RE2;Unchanged
TP_WAVELET_RE3;Reduced
diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc
index bb7c0ac6b..d1529184e 100644
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -3649,7 +3649,8 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
delete vCurve;
}
- shadowsHighlights(lab);
+ // shadowsHighlights(lab);
+ shadowsHighlights(lab, params->sh.enabled, params->sh.lab,params->sh.highlights ,params->sh.shadows, params->sh.radius, scale, params->sh.htonalwidth, params->sh.stonalwidth);
if (params->localContrast.enabled) {
// Alberto's local contrast
diff --git a/rtengine/improcfun.h b/rtengine/improcfun.h
index cd1650f6e..68aff736b 100644
--- a/rtengine/improcfun.h
+++ b/rtengine/improcfun.h
@@ -351,7 +351,8 @@ public:
void ToneMapFattal02(Imagefloat *rgb);
void localContrast(LabImage *lab);
void colorToningLabGrid(LabImage *lab, int xstart, int xend, int ystart, int yend, bool MultiThread);
- void shadowsHighlights(LabImage *lab);
+ //void shadowsHighlights(LabImage *lab);
+ void shadowsHighlights(LabImage *lab, bool ena, int labmode, int hightli, int shado, int rad, int scal, int hltonal, int shtonal);
void softLight(LabImage *lab);
void labColorCorrectionRegions(LabImage *lab);
diff --git a/rtengine/ipshadowshighlights.cc b/rtengine/ipshadowshighlights.cc
index 6ce66d9b3..96b8e84ef 100644
--- a/rtengine/ipshadowshighlights.cc
+++ b/rtengine/ipshadowshighlights.cc
@@ -27,20 +27,20 @@
#include "sleef.c"
namespace rtengine {
-
-void ImProcFunctions::shadowsHighlights(LabImage *lab)
+//modifications to pass parameters needs by locallab, to avoid 2 functions - no change in process - J.Desmis march 2019
+void ImProcFunctions::shadowsHighlights(LabImage *lab, bool ena, int labmode, int hightli, int shado, int rad, int scal, int hltonal, int shtonal)
{
- if (!params->sh.enabled || (!params->sh.highlights && !params->sh.shadows)){
+ if (!ena || (!hightli && !shado)){
return;
}
const int width = lab->W;
const int height = lab->H;
- const bool lab_mode = params->sh.lab;
+ const bool lab_mode = labmode;
array2D mask(width, height);
array2D L(width, height);
- const float radius = float(params->sh.radius) * 10 / scale;
+ const float radius = float(rad) * 10 / scal;
LUTf f(lab_mode ? 32768 : 65536);
TMatrix ws = ICCStore::getInstance()->workingSpaceMatrix(params->icm.workingProfile);
@@ -187,12 +187,12 @@ void ImProcFunctions::shadowsHighlights(LabImage *lab)
}
};
- if (params->sh.highlights > 0) {
- apply(params->sh.highlights * 0.7, params->sh.htonalwidth, true);
+ if (hightli > 0) {
+ apply(hightli * 0.7, hltonal, true);
}
- if (params->sh.shadows > 0) {
- apply(params->sh.shadows * 0.6, params->sh.stonalwidth, false);
+ if (shado > 0) {
+ apply(shado * 0.6, shtonal, false);
}
}
diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc
index 51dbe149e..bf9a6f37e 100644
--- a/rtengine/ipwavelet.cc
+++ b/rtengine/ipwavelet.cc
@@ -71,6 +71,7 @@ struct cont_params {
float thH;
float conres;
float conresH;
+ float radius;
float chrores;
float hueres;
float sky;
@@ -435,6 +436,7 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
cp.conres = waparams.rescon;
cp.conresH = waparams.resconH;
+ cp.radius = waparams.radius;
cp.chrores = waparams.reschro;
//cp.hueres=waparams.reshue;
cp.hueres = 2.f;
@@ -1782,7 +1784,7 @@ void ImProcFunctions::WaveletcontAllL(LabImage * labco, float ** varhue, float *
}
}
-//
+
if (cp.tonemap && cp.contmet == 1 && cp.resena) {
float maxp = max0 * 256.f;
float minp = min0 * 256.f;
@@ -1791,54 +1793,40 @@ void ImProcFunctions::WaveletcontAllL(LabImage * labco, float ** varhue, float *
#endif
ContrastResid(WavCoeffs_L0, cp, W_L, H_L, maxp, minp);
}
-
-#ifdef _OPENMP
- #pragma omp barrier
-#endif
+ }
if ((cp.conres != 0.f || cp.conresH != 0.f) && cp.resena) { // cp.conres = 0.f and cp.comresH = 0.f means that all will be multiplied by 1.f, so we can skip this step
+ LabImage *temp = nullptr;
+ temp = new LabImage(W_L, H_L);
#ifdef _OPENMP
- #pragma omp for nowait
+ #pragma omp for
#endif
-
- for (int i = 0; i < W_L * H_L; i++) {
- float LL = WavCoeffs_L0[i];
- float LL100 = LL / 327.68f;
- float tran = 5.f;//transition
- //shadow
- float alp = 3.f; //increase contrast sahdow in lowlights between 1 and ??
-
- if (cp.th > (100.f - tran)) {
- tran = 100.f - cp.th;
+ for (int i = 0; i < H_L; i++) {
+ for (int j = 0; j < W_L; j++) {
+ temp->L[i][j] = WavCoeffs_L0[i * W_L + j];
+ }
+ }
+ {
+ ImProcFunctions::shadowsHighlights(temp, true, 1, cp.conresH, cp.conres, cp.radius, skip, cp.thH, cp.th);
+ }
+#ifdef _OPENMP
+ #pragma omp for
+#endif
+ for (int i = 0; i < H_L; i++) {
+ for (int j = 0; j < W_L; j++) {
+ WavCoeffs_L0[i * W_L + j] = temp->L[i][j];
+ }
}
- if (LL100 < cp.th) {
- float aalp = (1.f - alp) / cp.th; //no changes for LL100 = cp.th
- float kk = aalp * LL100 + alp;
- WavCoeffs_L0[i] *= (1.f + kk * cp.conres / 200.f);
- } else if (LL100 < cp.th + tran) {
- float ath = -cp.conres / tran;
- float bth = cp.conres - ath * cp.th;
- WavCoeffs_L0[i] *= (1.f + (LL100 * ath + bth) / 200.f);
- }
+ delete temp;
- //highlight
- tran = 5.f;
-
- if (cp.thH < (tran)) {
- tran = cp.thH;
- }
-
- if (LL100 > cp.thH) {
- WavCoeffs_L0[i] *= (1.f + cp.conresH / 200.f);
- } else if (LL100 > (cp.thH - tran)) {
- float athH = cp.conresH / tran;
- float bthH = cp.conresH - athH * cp.thH;
- WavCoeffs_L0[i] *= (1.f + (LL100 * athH + bthH) / 200.f);
- }
- }
}
+
+#ifdef _OPENMP
+ #pragma omp parallel num_threads(wavNestedLevels) if(wavNestedLevels>1)
+#endif
+ {
//enabled Lipschitz..replace simple by complex edge detection
// I found this concept on the web (doctoral thesis on medical Imaging)
// I was inspired by the principle of Canny and Lipschitz (continuity and derivability)
diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc
index 1fa4d62a4..4a23e02dd 100644
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -2209,8 +2209,9 @@ WaveletParams::WaveletParams() :
edgrad(15),
edgval(0),
edgthresh(10),
- thr(35),
- thrH(65),
+ thr(30),
+ thrH(70),
+ radius(40),
skinprotect(0.0),
hueskin(-5, 25, 170, 120, false),
hueskin2(-260, -250, -130, -140, false),
@@ -2316,6 +2317,7 @@ bool WaveletParams::operator ==(const WaveletParams& other) const
&& edgthresh == other.edgthresh
&& thr == other.thr
&& thrH == other.thrH
+ && radius == other.radius
&& skinprotect == other.skinprotect
&& hueskin == other.hueskin
&& hueskin2 == other.hueskin2
@@ -3433,6 +3435,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || pedited->wavelet.resconH, "Wavelet", "ResidualcontHighlight", wavelet.resconH, keyFile);
saveToKeyfile(!pedited || pedited->wavelet.thr, "Wavelet", "ThresholdResidShadow", wavelet.thr, keyFile);
saveToKeyfile(!pedited || pedited->wavelet.thrH, "Wavelet", "ThresholdResidHighLight", wavelet.thrH, keyFile);
+ saveToKeyfile(!pedited || pedited->wavelet.radius, "Wavelet", "Residualradius", wavelet.radius, keyFile);
saveToKeyfile(!pedited || pedited->wavelet.reschro, "Wavelet", "Residualchroma", wavelet.reschro, keyFile);
saveToKeyfile(!pedited || pedited->wavelet.tmrs, "Wavelet", "ResidualTM", wavelet.tmrs, keyFile);
saveToKeyfile(!pedited || pedited->wavelet.edgs, "Wavelet", "ResidualEDGS", wavelet.edgs, keyFile);
@@ -4543,6 +4546,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "Wavelet", "ThrEdg", pedited, wavelet.edgthresh, pedited->wavelet.edgthresh);
assignFromKeyfile(keyFile, "Wavelet", "ThresholdResidShadow", pedited, wavelet.thr, pedited->wavelet.thr);
assignFromKeyfile(keyFile, "Wavelet", "ThresholdResidHighLight", pedited, wavelet.thrH, pedited->wavelet.thrH);
+ assignFromKeyfile(keyFile, "Wavelet", "Residualradius", pedited, wavelet.radius, pedited->wavelet.radius);
assignFromKeyfile(keyFile, "Wavelet", "ContrastCurve", pedited, wavelet.ccwcurve, pedited->wavelet.ccwcurve);
assignFromKeyfile(keyFile, "Wavelet", "OpacityCurveRG", pedited, wavelet.opacityCurveRG, pedited->wavelet.opacityCurveRG);
assignFromKeyfile(keyFile, "Wavelet", "OpacityCurveBY", pedited, wavelet.opacityCurveBY, pedited->wavelet.opacityCurveBY);
diff --git a/rtengine/procparams.h b/rtengine/procparams.h
index a17a34aaa..d5d055ca1 100644
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1243,6 +1243,7 @@ struct WaveletParams {
int edgthresh;
int thr;
int thrH;
+ int radius;
double skinprotect;
Threshold hueskin;
Threshold hueskin2;
diff --git a/rtgui/addsetids.h b/rtgui/addsetids.h
index 7e9f6f6cd..a03228c33 100644
--- a/rtgui/addsetids.h
+++ b/rtgui/addsetids.h
@@ -86,6 +86,7 @@ enum {
ADDSET_WA_SKINPROTECT,
ADDSET_WA_THRR,
ADDSET_WA_THRRH,
+ ADDSET_WA_RADIUS,
ADDSET_WA_THRES,
ADDSET_WA_THRESHOLD,
ADDSET_WA_THRESHOLD2,
diff --git a/rtgui/batchtoolpanelcoord.cc b/rtgui/batchtoolpanelcoord.cc
index 63934f21c..1c7e61b04 100644
--- a/rtgui/batchtoolpanelcoord.cc
+++ b/rtgui/batchtoolpanelcoord.cc
@@ -165,7 +165,7 @@ void BatchToolPanelCoordinator::initSession ()
shadowshighlights->setAdjusterBehavior (false, false);
dirpyrequalizer->setAdjusterBehavior (false, false, false);
- wavelet->setAdjusterBehavior (false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false);
+ wavelet->setAdjusterBehavior (false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false);
dirpyrdenoise->setAdjusterBehavior (false, false, false, false, false, false, false);
bayerprocess->setAdjusterBehavior(false, false, false, false, false, false);
xtransprocess->setAdjusterBehavior(false, false);
@@ -213,7 +213,7 @@ void BatchToolPanelCoordinator::initSession ()
blackwhite->setAdjusterBehavior (options.baBehav[ADDSET_BLACKWHITE_HUES], options.baBehav[ADDSET_BLACKWHITE_GAMMA]);
shadowshighlights->setAdjusterBehavior (options.baBehav[ADDSET_SH_HIGHLIGHTS], options.baBehav[ADDSET_SH_SHADOWS]);
dirpyrequalizer->setAdjusterBehavior (options.baBehav[ADDSET_DIRPYREQ], options.baBehav[ADDSET_DIRPYREQ_THRESHOLD], options.baBehav[ADDSET_DIRPYREQ_SKINPROTECT]);
- wavelet->setAdjusterBehavior (options.baBehav[ADDSET_WA], options.baBehav[ADDSET_WA_THRESHOLD], options.baBehav[ADDSET_WA_THRESHOLD2], options.baBehav[ADDSET_WA_THRES], options.baBehav[ADDSET_WA_CHRO], options.baBehav[ADDSET_WA_CHROMA], options.baBehav[ADDSET_WA_CONTRAST], options.baBehav[ADDSET_WA_SKINPROTECT], options.baBehav[ADDSET_WA_RESCHRO], options.baBehav[ADDSET_WA_TMRS], options.baBehav[ADDSET_WA_EDGS], options.baBehav[ADDSET_WA_SCALE], options.baBehav[ADDSET_WA_RESCON], options.baBehav[ADDSET_WA_RESCONH], options.baBehav[ADDSET_WA_THRR], options.baBehav[ADDSET_WA_THRRH], options.baBehav[ADDSET_WA_SKYPROTECT], options.baBehav[ADDSET_WA_EDGRAD], options.baBehav[ADDSET_WA_EDGVAL], options.baBehav[ADDSET_WA_STRENGTH], options.baBehav[ADDSET_WA_GAMMA], options.baBehav[ADDSET_WA_EDGEDETECT], options.baBehav[ADDSET_WA_EDGEDETECTTHR], options.baBehav[ADDSET_WA_EDGEDETECTTHR2]);
+ wavelet->setAdjusterBehavior (options.baBehav[ADDSET_WA], options.baBehav[ADDSET_WA_THRESHOLD], options.baBehav[ADDSET_WA_THRESHOLD2], options.baBehav[ADDSET_WA_THRES], options.baBehav[ADDSET_WA_CHRO], options.baBehav[ADDSET_WA_CHROMA], options.baBehav[ADDSET_WA_CONTRAST], options.baBehav[ADDSET_WA_SKINPROTECT], options.baBehav[ADDSET_WA_RESCHRO], options.baBehav[ADDSET_WA_TMRS], options.baBehav[ADDSET_WA_EDGS], options.baBehav[ADDSET_WA_SCALE], options.baBehav[ADDSET_WA_RESCON], options.baBehav[ADDSET_WA_RESCONH], options.baBehav[ADDSET_WA_THRR], options.baBehav[ADDSET_WA_THRRH], options.baBehav[ADDSET_WA_RADIUS], options.baBehav[ADDSET_WA_SKYPROTECT], options.baBehav[ADDSET_WA_EDGRAD], options.baBehav[ADDSET_WA_EDGVAL], options.baBehav[ADDSET_WA_STRENGTH], options.baBehav[ADDSET_WA_GAMMA], options.baBehav[ADDSET_WA_EDGEDETECT], options.baBehav[ADDSET_WA_EDGEDETECTTHR], options.baBehav[ADDSET_WA_EDGEDETECTTHR2]);
dirpyrdenoise->setAdjusterBehavior (options.baBehav[ADDSET_DIRPYRDN_LUMA], options.baBehav[ADDSET_DIRPYRDN_LUMDET], options.baBehav[ADDSET_DIRPYRDN_CHROMA], options.baBehav[ADDSET_DIRPYRDN_CHROMARED], options.baBehav[ADDSET_DIRPYRDN_CHROMABLUE], options.baBehav[ADDSET_DIRPYRDN_GAMMA], options.baBehav[ADDSET_DIRPYRDN_PASSES]);
bayerprocess->setAdjusterBehavior(options.baBehav[ADDSET_BAYER_FALSE_COLOR_SUPPRESSION], options.baBehav[ADDSET_BAYER_ITER], options.baBehav[ADDSET_BAYER_DUALDEMOZCONTRAST], options.baBehav[ADDSET_BAYER_PS_SIGMA], options.baBehav[ADDSET_BAYER_PS_SMOOTH], options.baBehav[ADDSET_BAYER_PS_EPERISO]);
xtransprocess->setAdjusterBehavior(options.baBehav[ADDSET_BAYER_FALSE_COLOR_SUPPRESSION], options.baBehav[ADDSET_BAYER_DUALDEMOZCONTRAST]);
@@ -333,6 +333,7 @@ void BatchToolPanelCoordinator::initSession ()
if (options.baBehav[ADDSET_WA_SCALE]) { pparams.wavelet.scale = 0; }
if (options.baBehav[ADDSET_WA_THRR]) { pparams.wavelet.thr = 0; }
if (options.baBehav[ADDSET_WA_THRRH]) { pparams.wavelet.thrH = 0; }
+ if (options.baBehav[ADDSET_WA_RADIUS]) { pparams.wavelet.radius = 0; }
if (options.baBehav[ADDSET_WA_SKYPROTECT]) { pparams.wavelet.sky = 0; }
if (options.baBehav[ADDSET_WA_EDGRAD]) { pparams.wavelet.edgrad = 0; }
if (options.baBehav[ADDSET_WA_EDGVAL]) { pparams.wavelet.edgval = 0; }
diff --git a/rtgui/paramsedited.h b/rtgui/paramsedited.h
index 5e123e638..160f68feb 100644
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -519,6 +519,7 @@ struct WaveletParamsEdited {
bool edgthresh;
bool thr;
bool thrH;
+ bool radius;
bool skinprotect;
bool hueskin;
bool hueskin2;
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index 63a9315a6..2269c6749 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -387,6 +387,7 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
appendBehavList (mi, M ("TP_WAVELET_THR"), ADDSET_WA_THRR, true);
appendBehavList (mi, M ("TP_WAVELET_RESCONH"), ADDSET_WA_RESCONH, true);
appendBehavList (mi, M ("TP_WAVELET_THRH"), ADDSET_WA_THRRH, true);
+ appendBehavList (mi, M ("TP_WAVELET_RADIUS"), ADDSET_WA_RADIUS, true);
appendBehavList (mi, M ("TP_WAVELET_RESCHRO"), ADDSET_WA_RESCHRO, true);
appendBehavList (mi, M ("TP_WAVELET_TMSTRENGTH"), ADDSET_WA_TMRS, true);
appendBehavList (mi, M ("TP_WAVELET_TMEDGS"), ADDSET_WA_EDGS, true);
diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc
index 165db8e94..5275fa948 100644
--- a/rtgui/wavelet.cc
+++ b/rtgui/wavelet.cc
@@ -77,8 +77,8 @@ Wavelet::Wavelet() :
tmr(Gtk::manage(new Gtk::CheckButton(M("TP_WAVELET_BALCHRO")))),
showmask(Gtk::manage(new Gtk::CheckButton(M("TP_WAVELET_SHOWMASK")))),
neutralchButton(Gtk::manage(new Gtk::Button(M("TP_WAVELET_NEUTRAL")))),
- rescon(Gtk::manage(new Adjuster(M("TP_WAVELET_RESCON"), -100, 100, 1, 0))),
- resconH(Gtk::manage(new Adjuster(M("TP_WAVELET_RESCONH"), -100, 100, 1, 0))),
+ rescon(Gtk::manage(new Adjuster(M("TP_WAVELET_RESCON"), 0, 100, 1, 0))),
+ resconH(Gtk::manage(new Adjuster(M("TP_WAVELET_RESCONH"), 0, 100, 1, 0))),
reschro(Gtk::manage(new Adjuster(M("TP_WAVELET_RESCHRO"), -100, 100, 1, 0))),
tmrs(Gtk::manage(new Adjuster(M("TP_WAVELET_TMSTRENGTH"), -1.0, 2.0, 0.01, 0.0))),
edgs(Gtk::manage(new Adjuster(M("TP_WAVELET_TMEDGS"), 0.1, 4.0, 0.01, 1.4))),
@@ -90,8 +90,9 @@ Wavelet::Wavelet() :
chroma(Gtk::manage(new Adjuster(M("TP_WAVELET_CHRO"), 1, 9, 1, 5))),
chro(Gtk::manage(new Adjuster(M("TP_WAVELET_CHR"), 0., 100., 1., 0.))),
contrast(Gtk::manage(new Adjuster(M("TP_WAVELET_CONTRA"), -100, 100, 1, 0))),
- thr(Gtk::manage(new Adjuster(M("TP_WAVELET_THR"), 0, 100, 1, 35))),
- thrH(Gtk::manage(new Adjuster(M("TP_WAVELET_THRH"), 0, 100, 1, 65))),
+ thr(Gtk::manage(new Adjuster(M("TP_WAVELET_THR"), 0, 100, 1, 30))),
+ thrH(Gtk::manage(new Adjuster(M("TP_WAVELET_THRH"), 0, 100, 1, 70))),
+ radius(Gtk::manage(new Adjuster(M("TP_WAVELET_RADIUS"), 0, 100, 1, 40))),
skinprotect(Gtk::manage(new Adjuster(M("TP_WAVELET_SKIN"), -100, 100, 1, 0.))),
edgrad(Gtk::manage(new Adjuster(M("TP_WAVELET_EDRAD"), 0, 100, 1, 15))),
edgval(Gtk::manage(new Adjuster(M("TP_WAVELET_EDVAL"), 0, 100, 1, 0))),
@@ -167,6 +168,7 @@ Wavelet::Wavelet() :
EvWavshowmask = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_WAVSHOWMASK");
EvWavedgs = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_WAVEDGS");
EvWavscale = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_WAVSCALE");
+ EvWavradius = m->newEvent(DIRPYREQUALIZER, "HISTORY_MSG_WAVRADIUS");
expsettings->signal_button_release_event().connect_notify(sigc::bind(sigc::mem_fun(this, &Wavelet::foldAllButMe), expsettings));
@@ -678,6 +680,9 @@ Wavelet::Wavelet() :
thrH->setAdjusterListener(this);
resBox->pack_start(*thrH, Gtk::PACK_SHRINK);
+ radius->setAdjusterListener(this);
+ resBox->pack_start(*radius, Gtk::PACK_SHRINK);
+
contrast->set_tooltip_text(M("TP_WAVELET_CONTRA_TOOLTIP"));
contrast->setAdjusterListener(this);
resBox->pack_start(*contrast); //keep the possibility to reinstall
@@ -1231,6 +1236,7 @@ void Wavelet::read(const ProcParams* pp, const ParamsEdited* pedited)
edgthresh->setValue(pp->wavelet.edgthresh);
thr->setValue(pp->wavelet.thr);
thrH->setValue(pp->wavelet.thrH);
+ radius->setValue(pp->wavelet.radius);
skinprotect->setValue(pp->wavelet.skinprotect);
hueskin->setValue(pp->wavelet.hueskin);
hueskin2->setValue(pp->wavelet.hueskin2);
@@ -1406,6 +1412,7 @@ void Wavelet::read(const ProcParams* pp, const ParamsEdited* pedited)
edgval->setEditedState(pedited->wavelet.edgval ? Edited : UnEdited);
thr->setEditedState(pedited->wavelet.thr ? Edited : UnEdited);
thrH->setEditedState(pedited->wavelet.thrH ? Edited : UnEdited);
+ radius->setEditedState(pedited->wavelet.radius ? Edited : UnEdited);
skinprotect->setEditedState(pedited->wavelet.skinprotect ? Edited : UnEdited);
hueskin->setEditedState(pedited->wavelet.hueskin ? Edited : UnEdited);
hueskin2->setEditedState(pedited->wavelet.hueskin2 ? Edited : UnEdited);
@@ -1567,6 +1574,7 @@ void Wavelet::write(ProcParams* pp, ParamsEdited* pedited)
pp->wavelet.edgthresh = edgthresh->getValue();
pp->wavelet.thr = thr->getValue();
pp->wavelet.thrH = thrH->getValue();
+ pp->wavelet.radius = radius->getValue();
pp->wavelet.hueskin = hueskin->getValue ();
pp->wavelet.hueskin2 = hueskin2->getValue ();
pp->wavelet.skinprotect = skinprotect->getValue();
@@ -1676,6 +1684,7 @@ void Wavelet::write(ProcParams* pp, ParamsEdited* pedited)
pedited->wavelet.edgval = edgval->getEditedState();
pedited->wavelet.thr = thr->getEditedState();
pedited->wavelet.thrH = thrH->getEditedState();
+ pedited->wavelet.radius = radius->getEditedState();
pedited->wavelet.hueskin = hueskin->getEditedState();
pedited->wavelet.hueskin2 = hueskin2->getEditedState();
pedited->wavelet.skinprotect = skinprotect->getEditedState();
@@ -1910,6 +1919,7 @@ void Wavelet::setDefaults(const ProcParams* defParams, const ParamsEdited* pedit
edgthresh->setDefault(defParams->wavelet.edgthresh);
thr->setDefault(defParams->wavelet.thr);
thrH->setDefault(defParams->wavelet.thrH);
+ radius->setDefault(defParams->wavelet.radius);
hueskin->setDefault (defParams->wavelet.hueskin);
hueskin2->setDefault (defParams->wavelet.hueskin2);
hllev->setDefault (defParams->wavelet.hllev);
@@ -1970,6 +1980,7 @@ void Wavelet::setDefaults(const ProcParams* defParams, const ParamsEdited* pedit
edgthresh->setDefault(defParams->wavelet.edgthresh);
thr->setDefaultEditedState(pedited->wavelet.thr ? Edited : UnEdited);
thrH->setDefaultEditedState(pedited->wavelet.thrH ? Edited : UnEdited);
+ radius->setDefaultEditedState(pedited->wavelet.radius ? Edited : UnEdited);
skinprotect->setDefaultEditedState(pedited->wavelet.skinprotect ? Edited : UnEdited);
hueskin->setDefaultEditedState(pedited->wavelet.hueskin ? Edited : UnEdited);
hueskin2->setDefaultEditedState(pedited->wavelet.hueskin2 ? Edited : UnEdited);
@@ -2019,6 +2030,7 @@ void Wavelet::setDefaults(const ProcParams* defParams, const ParamsEdited* pedit
edgthresh->setDefaultEditedState(Irrelevant);
thr->setDefaultEditedState(Irrelevant);
thrH->setDefaultEditedState(Irrelevant);
+ radius->setDefaultEditedState(Irrelevant);
skinprotect->setDefaultEditedState(Irrelevant);
hueskin->setDefaultEditedState(Irrelevant);
hueskin2->setDefaultEditedState(Irrelevant);
@@ -2533,6 +2545,7 @@ void Wavelet::setBatchMode(bool batchMode)
edgthresh->showEditedCB();
thr->showEditedCB();
thrH->showEditedCB();
+ radius->showEditedCB();
skinprotect->showEditedCB();
hueskin->showEditedCB();
hueskin2->showEditedCB();
@@ -2625,6 +2638,8 @@ void Wavelet::adjusterChanged(Adjuster* a, double newval)
listener->panelChanged(EvWavthr, thr->getTextValue());
} else if (a == thrH) {
listener->panelChanged(EvWavthrH, thrH->getTextValue());
+ } else if (a == radius) {
+ listener->panelChanged(EvWavradius, radius->getTextValue());
} else if (a == threshold) {
listener->panelChanged(EvWavThreshold, threshold->getTextValue());
} else if (a == threshold2) {
@@ -3181,7 +3196,7 @@ void Wavelet::colorForValue(double valX, double valY, enum ColorCaller::ElemType
caller->ccGreen = double(G);
caller->ccBlue = double(B);
}
-void Wavelet::setAdjusterBehavior(bool multiplieradd, bool thresholdadd, bool threshold2add, bool thresadd, bool chroadd, bool chromaadd, bool contrastadd, bool skinadd, bool reschroadd, bool tmrsadd, bool edgsadd, bool scaleadd, bool resconadd, bool resconHadd, bool thradd, bool thrHadd, bool skyadd, bool edgradadd, bool edgvaladd, bool strengthadd, bool gammaadd, bool edgedetectadd, bool edgedetectthradd, bool edgedetectthr2add)
+void Wavelet::setAdjusterBehavior(bool multiplieradd, bool thresholdadd, bool threshold2add, bool thresadd, bool chroadd, bool chromaadd, bool contrastadd, bool skinadd, bool reschroadd, bool tmrsadd, bool edgsadd, bool scaleadd, bool resconadd, bool resconHadd, bool thradd, bool thrHadd, bool radiusadd, bool skyadd, bool edgradadd, bool edgvaladd, bool strengthadd, bool gammaadd, bool edgedetectadd, bool edgedetectthradd, bool edgedetectthr2add)
{
for (int i = 0; i < 9; i++) {
@@ -3203,6 +3218,7 @@ void Wavelet::setAdjusterBehavior(bool multiplieradd, bool thresholdadd, bool th
scale->setAddMode(scaleadd);
thr->setAddMode(thradd);
thrH->setAddMode(thrHadd);
+ radius->setAddMode(radiusadd);
sky->setAddMode(skyadd);
edgrad->setAddMode(edgradadd);
edgval->setAddMode(edgvaladd);
diff --git a/rtgui/wavelet.h b/rtgui/wavelet.h
index 5878a1ae4..4ef36d076 100644
--- a/rtgui/wavelet.h
+++ b/rtgui/wavelet.h
@@ -50,7 +50,7 @@ public:
void autoOpenCurve () override;
void curveChanged (CurveEditor* ce) override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
- void setAdjusterBehavior (bool multiplieradd, bool thresholdadd, bool threshold2add, bool thresadd, bool chroadd, bool chromaadd, bool contrastadd, bool skinadd, bool reschroadd, bool tmrsadd, bool edgsadd, bool scaleadd, bool resconadd, bool resconHadd, bool thradd, bool thrHadd, bool skyadd, bool edgradadd, bool edgvaladd, bool strengthadd, bool gammaadd, bool edgedetectadd, bool edgedetectthradd, bool edgedetectthr2add);
+ void setAdjusterBehavior (bool multiplieradd, bool thresholdadd, bool threshold2add, bool thresadd, bool chroadd, bool chromaadd, bool contrastadd, bool skinadd, bool reschroadd, bool tmrsadd, bool edgsadd, bool scaleadd, bool resconadd, bool resconHadd, bool thradd, bool thrHadd, bool radiusadd, bool skyadd, bool edgradadd, bool edgvaladd, bool strengthadd, bool gammaadd, bool edgedetectadd, bool edgedetectthradd, bool edgedetectthr2add);
void setBatchMode (bool batchMode) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setEditProvider (EditDataProvider *provider) override;
@@ -74,6 +74,7 @@ private:
rtengine::ProcEvent EvWavshowmask;
rtengine::ProcEvent EvWavedgs;
rtengine::ProcEvent EvWavscale;
+ rtengine::ProcEvent EvWavradius;
void foldAllButMe (GdkEventButton* event, MyExpander *expander);
@@ -180,6 +181,7 @@ private:
Adjuster* const contrast;
Adjuster* const thr;
Adjuster* const thrH;
+ Adjuster* const radius;
Adjuster* const skinprotect;
Adjuster* const edgrad;
Adjuster* const edgval;