From c726df3eb7445e2f87468d3d4bbd322b834a6b9a Mon Sep 17 00:00:00 2001 From: Desmis Date: Sun, 20 Oct 2019 18:13:11 +0200 Subject: [PATCH] Chnage some label function and default settings --- rtdata/languages/default | 3 ++- rtengine/iplocallab.cc | 2 +- rtengine/procparams.cc | 2 +- rtgui/locallab.cc | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index e330e51f1..55290284d 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1015,7 +1015,7 @@ HISTORY_MSG_774;Local - Reti Mask contrast curve HISTORY_MSG_775;Local - CBDL Mask contrast curve HISTORY_MSG_776;Local - Blur Denoise Mask contrast curve HISTORY_MSG_777;Local - Blur Mask local contrast curve -HISTORY_MSG_778;Local - Blur Mask shadows +HISTORY_MSG_778;Local - Blur Mask highlights HISTORY_MSG_779;Local - Color Mask local contrast curve HISTORY_MSG_780;Local - Color Mask shadows HISTORY_MSG_781;Local - Local contrast Wavelet level @@ -2126,6 +2126,7 @@ TP_LOCALLAB_CHROMASKCOL;Chroma mask TP_LOCALLAB_GAMMASKCOL;Gamma mask TP_LOCALLAB_SLOMASKCOL;Slope mask TP_LOCALLAB_SHAMASKCOL;Shadows mask +TP_LOCALLAB_HIGHMASKCOL;Highlights mask TP_LOCALLAB_LAPMASKCOL;Laplacian threshold mask TP_LOCALLAB_LMASK_LL_TOOLTIP;Give priority to action on midtones and high lights TP_LOCALLAB_LMASK_LEVEL_TOOLTIP;Give priority to action on midtones and high lights and by choosing the concerned wavelet levels diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index 66789b41c..9088f2215 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -7303,7 +7303,7 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o int shado = params->locallab.spots.at(sp).shadmaskbl; if (shado > 0 && (lp.enablMask || lp.showmaskblmet == 3)) { - ImProcFunctions::shadowsHighlights(bufmaskblurbl.get(), true, 1, 0, shado, 40, sk, 0, lp.shcomp); + ImProcFunctions::shadowsHighlights(bufmaskblurbl.get(), true, 1, shado, 0, 40, sk, lp.shcomp, 0); } // deltae Mask with scope diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 8342d25e7..a460c2dfc 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2433,7 +2433,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : transitgrad(0.0), avoid(false), laplac(false), - deltae(true), + deltae(false), scopemask(50), // Color & Light expcolor(false), diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 1fe348fc6..9846c123e 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -265,7 +265,7 @@ Locallab::Locallab(): gammaskbl(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GAMMASKCOL"), 0.05, 5.0, 0.01, 1.))), slomaskbl(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SLOMASKCOL"), 0.0, 15.0, 0.1, 0.))), lapmaskbl(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LAPMASKCOL"), 0.0, 100.0, 0.1, 0.))), - shadmaskbl(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHAMASKCOL"), 0, 100, 1, 0))), + shadmaskbl(Gtk::manage(new Adjuster(M("TP_LOCALLAB_HIGHMASKCOL"), 0, 100, 1, 0))), isogr(Gtk::manage(new Adjuster(M("TP_LOCALLAB_ISOGR"), 20, 6400, 1, 400))), strengr(Gtk::manage(new Adjuster(M("TP_LOCALLAB_STRENGR"), 0, 100, 1, 0))), scalegr(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SCALEGR"), 0, 100, 1, 100))),