From 0319a93496e91ceca3de16ed71e607edef029f4f Mon Sep 17 00:00:00 2001 From: Desmis Date: Sun, 8 Sep 2019 06:50:08 +0200 Subject: [PATCH] Change settings Exposure PDE --- rtengine/dcrop.cc | 3 +++ rtengine/improccoordinator.cc | 6 ++++-- rtengine/iplocallab.cc | 2 +- rtengine/procparams.cc | 12 ++++++------ rtengine/simpleprocess.cc | 3 +++ rtgui/locallab.cc | 12 ++++++------ 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc index 98b76e88c..04561b235 100644 --- a/rtengine/dcrop.cc +++ b/rtengine/dcrop.cc @@ -991,6 +991,9 @@ void Crop::update(int todo) double hlcomprthresh = params.locallab.spots.at(sp).hlcomprthresh; double shcompr = params.locallab.spots.at(sp).shcompr; double br = params.locallab.spots.at(sp).lightness; + if(black < 0. && params.locallab.spots.at(sp).expMethod == "pde" ) { + black *= 1.5; + } double cont = params.locallab.spots.at(sp).contrast; double huere, chromare, lumare, huerefblu, chromarefblu, lumarefblu, sobelre; diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index f0f2fe91b..32cb6aa75 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -948,8 +948,10 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange) double shcompr = params->locallab.spots.at(sp).shcompr; double br = params->locallab.spots.at(sp).lightness; double cont = params->locallab.spots.at(sp).contrast; - - // Reference parameters computation + if(black < 0. && params->locallab.spots.at(sp).expMethod == "pde" ) { + black *= 1.5; + } + // Reference parameters computation if (params->locallab.spots.at(sp).spotMethod == "exc") { ipf.calc_ref(sp, reserv, reserv, 0, 0, pW, pH, scale, huerefblu, chromarefblu, lumarefblu, huere, chromare, lumare, sobelre, avge); } else { diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index 88b2a75f5..d51effa34 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -9097,7 +9097,7 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o for (int y = 0; y < bfhr; y++) { for (int x = 0; x < bfwr; x++) { - float L = LIM01(bufexpfin->L[y][x] / 32768.f);//chnage gamma for Laplacian + float L = LIM01(bufexpfin->L[y][x] / 32768.f);//change gamma for Laplacian L = pow(L, gam); L *= 32768.f; datain[y * bfwr + x] = L; diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 1b71746e6..222d0436e 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2434,8 +2434,8 @@ LocallabParams::LocallabSpot::LocallabSpot() : expcomp(0.0), hlcompr(0), hlcomprthresh(0), - black(0), - shadex(0), + black(-6000), + shadex(20), shcompr(50), expchroma(30), warm(0), @@ -2455,10 +2455,10 @@ LocallabParams::LocallabSpot::LocallabSpot() : slomaskexp(0.0), softradiusexp(0.0), expMethod("std"), - laplacexp(20.0), - balanexp(0.8), - linear(0.0), - gamm(1.0), + laplacexp(40.0), + balanexp(0.75), + linear(0.3), + gamm(0.4), // Shadow highlight expshadhigh(false), highlights(0), diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc index 21271f387..7b988821f 100644 --- a/rtengine/simpleprocess.cc +++ b/rtengine/simpleprocess.cc @@ -1197,6 +1197,9 @@ private: double shcompr = params.locallab.spots.at(sp).shcompr; double br = params.locallab.spots.at(sp).lightness; double cont = params.locallab.spots.at(sp).contrast; + if(black < 0. && params.locallab.spots.at(sp).expMethod == "pde" ) { + black *= 1.5; + } // Reference parameters computation double huere, chromare, lumare, huerefblu, chromarefblu, lumarefblu, sobelre; diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 2964c2181..dadc961d7 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -194,8 +194,8 @@ Locallab::Locallab(): expcomp(Gtk::manage(new Adjuster(M("TP_EXPOSURE_EXPCOMP"), -2.0, 4.0, 0.05, 0.0))), hlcompr(Gtk::manage(new Adjuster(M("TP_EXPOSURE_COMPRHIGHLIGHTS"), 0, 500, 1, 0))), hlcomprthresh(Gtk::manage(new Adjuster(M("TP_EXPOSURE_COMPRHIGHLIGHTSTHRESHOLD"), 0, 100, 1, 0))), - black(Gtk::manage(new Adjuster(M("TP_EXPOSURE_BLACKLEVEL"), -30000, 32768, 50, 0))), - shadex(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHADEX"), 0, 100, 1, 0))), + black(Gtk::manage(new Adjuster(M("TP_EXPOSURE_BLACKLEVEL"), -16384, 32768, 10, -6000))), + shadex(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHADEX"), 0, 100, 1, 20))), shcompr(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHADEXCOMP"), 0, 100, 1, 50))), expchroma(Gtk::manage(new Adjuster(M("TP_LOCALLAB_EXPCHROMA"), -50, 100, 1, 30))), warm(Gtk::manage(new Adjuster(M("TP_LOCALLAB_WARM"), -100., 100., 1., 0., Gtk::manage(new RTImage("circle-blue-small.png")), Gtk::manage(new RTImage("circle-orange-small.png"))))), @@ -208,10 +208,10 @@ Locallab::Locallab(): gammaskexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GAMMASKCOL"), 0.25, 4.0, 0.01, 1.))), slomaskexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SLOMASKCOL"), 0.0, 15.0, 0.1, 0.))), softradiusexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SOFTRADIUSCOL"), 0.0, 100.0, 0.5, 0.))), - laplacexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LAPLACEXP"), 0.0, 100.0, 0.1, 20.))), - balanexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BALANEXP"), 0.2, 1.2, 0.01, 0.8))), - linear(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LINEAR"), 0., 1., 0.01, 0.))), - gamm(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GAMM"), 0.1, 2., 0.01, 1.))), + laplacexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LAPLACEXP"), 0.0, 100.0, 0.1, 40.))), + balanexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BALANEXP"), 0.2, 1.2, 0.01, 0.75))), + linear(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LINEAR"), 0., 1., 0.01, 0.3))), + gamm(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GAMM"), 0.2, 1.3, 0.01, 0.4))), //Shadow hightlights highlights(Gtk::manage(new Adjuster(M("TP_SHADOWSHLIGHTS_HIGHLIGHTS"), 0, 100, 1, 0))), h_tonalwidth(Gtk::manage(new Adjuster(M("TP_SHADOWSHLIGHTS_HLTONALW"), 10, 100, 1, 70))),