Disable TM main menu if TM local enabled

This commit is contained in:
Desmis 2019-05-03 14:08:29 +02:00
parent 6d50339af4
commit 14f3d0050e
3 changed files with 4 additions and 2 deletions

View File

@ -2123,6 +2123,7 @@ 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_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.

View File

@ -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<int>(lp.yc - lp.lyT) - cy, 0);
const int yend = std::min(static_cast<int>(lp.yc + lp.ly) - cy, original->H);

View File

@ -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);