From 7cde1dca07b8d1d2105b270f6f03e05873831d33 Mon Sep 17 00:00:00 2001 From: Desmis Date: Sat, 25 Jan 2020 08:52:23 +0100 Subject: [PATCH] Improvment to show modifications --- rtdata/languages/default | 1 + rtengine/iplocallab.cc | 6 ++++-- rtengine/procparams.cc | 2 +- rtgui/controlspotpanel.cc | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index 7c1da70d7..c0ce1a152 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -2261,6 +2261,7 @@ TP_LOCALLAB_COFR;Color & Light - Small defects TP_LOCALLAB_COL_NAME;Name TP_LOCALLAB_COL_VIS;Status TP_LOCALLAB_COLORDE;Color preview selection ΔE and Intensity +TP_LOCALLAB_COLORDE_TOOLTIP;Show preview selection ΔE in blue if negative and in green if positive.\nShow real modifications if positive, show enhanced modifications with blue and yellow if negative.\nThe intensity is function of the level. TP_LOCALLAB_COMPFRA;Levels Dynamic Laplacian Range Compression ƒ TP_LOCALLAB_COMPREFRA;Levels Dynamic Wavelet Range (un)Compression TP_LOCALLAB_COMPRESS_TOOLTIP;Use if necessary the module 'Clarity & Sharp mask and Blend & Soft Images' by adjusting 'Soft radius' to reduce artifacts. diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index a8ba379cc..64a3fad1a 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -6611,11 +6611,13 @@ void ImProcFunctions::transit_shapedetect2(int call, int senstype, const LabImag difb = factorx * realstrbdE; float maxdifab = max(fabs(difa), fabs(difb)); - if (origshow) { //original Retinex + if((expshow || vibshow || colshow || SHshow || tmshow || lcshow || origshow) && lp.colorde < 0) {//show modifications whith use "b" + // (origshow && lp.colorde < 0) { //original Retinex transformed->a[y + ystart][x + xstart] = 0.f; transformed->b[y + ystart][x + xstart] = ampli * 8.f * diflc * reducdE; + transformed->L[y + ystart][x + xstart] = CLIP(12000.f + 0.5f * ampli * diflc); - } else if (expshow || vibshow || colshow || SHshow || tmshow || lcshow) {//show modifications + } else if ((expshow || vibshow || colshow || SHshow || tmshow || lcshow || origshow) && lp.colorde > 0) {//show modifications whithout use "b" if (diflc < 1000.f) {//if too low to be view use ab diflc += 0.5f * maxdifab; } diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index f694b70c8..e67b11341 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2439,7 +2439,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : iter(2.0), balan(1.0), balanh(1.0), - colorde(-5.0), + colorde(5.0), transitweak(1.0), transitgrad(0.0), avoid(false), diff --git a/rtgui/controlspotpanel.cc b/rtgui/controlspotpanel.cc index 777db7553..5ec975fc2 100644 --- a/rtgui/controlspotpanel.cc +++ b/rtgui/controlspotpanel.cc @@ -70,7 +70,7 @@ ControlSpotPanel::ControlSpotPanel(): iter_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_PROXI"), 0.2, 10.0, 0.1, 2.0))), balan_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BALAN"), 0.2, 2.5, 0.1, 1.0, Gtk::manage(new RTImage("rawtherapee-logo-16.png")), Gtk::manage(new RTImage("circle-white-small.png"))))), balanh_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BALANH"), 0.2, 2.5, 0.1, 1.0, Gtk::manage(new RTImage("rawtherapee-logo-16.png")),Gtk::manage(new RTImage("circle-red-green-small.png"))))), - colorde_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_COLORDE"), -15, 15, 2, -5, Gtk::manage(new RTImage("circle-blue-small.png")),Gtk::manage(new RTImage("circle-green-small.png"))))), + colorde_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_COLORDE"), -15, 15, 2, 5, Gtk::manage(new RTImage("circle-blue-yellow-small.png")),Gtk::manage(new RTImage("circle-gray-green-small.png"))))), transitweak_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITWEAK"), 0.5, 15.0, 0.1, 1.0))), transitgrad_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITGRAD"), -1.0, 1.0, 0.01, 0.0))), scopemask_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SCOPEMASK"), 0, 100, 1, 60))), @@ -393,6 +393,7 @@ ControlSpotPanel::ControlSpotPanel(): if (showtooltip) { balan_->set_tooltip_text(M("TP_LOCALLAB_BALAN_TOOLTIP")); balanh_->set_tooltip_text(M("TP_LOCALLAB_BALAN_TOOLTIP")); + colorde_->set_tooltip_text(M("TP_LOCALLAB_COLORDE_TOOLTIP")); } /*