diff --git a/rtdata/languages/default b/rtdata/languages/default index d5f49221e..4f1a13eb0 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -2122,7 +2122,8 @@ TP_LOCALLAB_TRANSITVALUE;Transition value TP_LOCALLAB_TRANSITGRAD;Transition differentiation XY TP_LOCALLAB_TRANSITGRAD_TOOLTIP;Changes the transition of the abscissa to that of the ordinate TP_LOCALLAB_TRANSITWEAK;Transition weakening -TP_LOCALLAB_TRANSITWEAK_TOOLTIP;Adjust weakening : change smoothness process - 1 linear - 2 parabolic - 3 cubic +TP_LOCALLAB_TRANSITWEAK_TOOLTIP;Adjust weakening : change smoothness process - 1 linear - 2 parabolic - 3 cubic +TP_LOCALLAB_TONEMAP_TOOLTIP;Tone Mapping - main menu must be disabled TP_LOCALLAB_VIBRANCE;Vibrance TP_LOCALLAB_WARM;Warm - Cool & Color artifacts TP_LOCALLAB_WARM_TOOLTIP;This slider use Ciecam algorithm and acts as White Balance, it can warm or cool the area selected.\nIt can also in some cases reduce color artifacts. diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index fa6ac2cfc..4aeed72de 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -5211,7 +5211,7 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o //Tone mapping - if (lp.strengt != 0.f && lp.tonemapena) { + if (lp.strengt != 0.f && lp.tonemapena && !params->epd.enabled) { if (call <= 3) { //simpleprocess dcrop improcc const int ystart = std::max(static_cast(lp.yc - lp.lyT) - cy, 0); const int yend = std::min(static_cast(lp.yc + lp.ly) - cy, original->H); diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 9f97d1d61..5756a3deb 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -767,6 +767,7 @@ Locallab::Locallab(): exptonemap->setLabel(TMTitleHBox); exptonemap->signal_button_release_event().connect_notify(sigc::bind(sigc::mem_fun(this, &Locallab::foldAllButMe), exptonemap)); enabletonemapConn = exptonemap->signal_enabled_toggled().connect(sigc::bind(sigc::mem_fun(this, &Locallab::enableToggled), exptonemap)); + if(showtooltip) exptonemap->set_tooltip_text(M("TP_LOCALLAB_TONEMAP_TOOLTIP")); stren->setAdjusterListener(this);