From 7d696a24e627b5acc33faacb1eb0876035512047 Mon Sep 17 00:00:00 2001 From: Desmis Date: Fri, 23 Oct 2020 07:13:22 +0200 Subject: [PATCH] Local adjustments - Another changes max slope and tooltip --- rtdata/languages/default | 2 +- rtengine/iplocallab.cc | 4 +++- rtgui/locallabtools.cc | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index 24318cb33..51d11b729 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -2813,7 +2813,7 @@ TP_LOCALLAB_SHOWSTRUCEX;Show spot structure(advanced) TP_LOCALLAB_SHOWT;Mask and modifications TP_LOCALLAB_SHOWVI;Mask and modifications TP_LOCALLAB_SHRESFRA;Shadows/Highlights -TP_LOCALLAB_SHTRC_TOOLTIP;Modifies the tones of the image by acting on a TRC (Tone Response Curve).\nGamma acts mainly on light tones.\nSlope acts mainly on dark tones.\nIt is recommended that the TRC of both devices (monitor and output profile) be sRGB (default). +TP_LOCALLAB_SHTRC_TOOLTIP;Based on 'working profile' (only those provided), modifies the tones of the image by acting on a TRC (Tone Response Curve).\nGamma acts mainly on light tones.\nSlope acts mainly on dark tones.\nIt is recommended that the TRC of both devices (monitor and output profile) be sRGB (default). TP_LOCALLAB_SH_TOOLNAME;Shadows/Highlights & Tone Equalizer - 5 TP_LOCALLAB_SIGMAWAV;Attenuation response TP_LOCALLAB_SIM;Simple diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index bfa148304..dfba8a4c2 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -11049,8 +11049,10 @@ void ImProcFunctions::Lab_Local( } bool tonecurv = false; + const Glib::ustring profile = params->icm.workingProfile; + bool isworking = (profile == "sRGB" || profile == "Adobe RGB" || profile == "ProPhoto" || profile == "WideGamut" || profile == "BruceRGB" || profile == "Beta RGB" || profile == "BestRGB" || profile == "Rec2020" || profile == "ACESp0" || profile == "ACESp1"); - if (params->locallab.spots.at(sp).gamSH != 2.4 || params->locallab.spots.at(sp).sloSH != 12.92) { + if (isworking && (params->locallab.spots.at(sp).gamSH != 2.4 || params->locallab.spots.at(sp).sloSH != 12.92)) { tonecurv = true; } diff --git a/rtgui/locallabtools.cc b/rtgui/locallabtools.cc index 3fb654245..f9dbab2eb 100644 --- a/rtgui/locallabtools.cc +++ b/rtgui/locallabtools.cc @@ -3557,7 +3557,7 @@ LocallabShadow::LocallabShadow(): blurSHde(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BLURDE"), 2, 100, 1, 5))), gamFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_GAMFRA")))), gamSH(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GAMSH"), 0.25, 15.0, 0.01, 2.4))), - sloSH(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SLOSH"), 0.0, 300.0, 0.01, 12.92))), + sloSH(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SLOSH"), 0.0, 500.0, 0.01, 12.92))), expgradsh(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_EXPGRAD")))), strSH(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -4., 4., 0.05, 0.))), angSH(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))),