From b95f13db982e7aa1b7c09276ef15309c4213cff3 Mon Sep 17 00:00:00 2001 From: Desmis Date: Mon, 25 May 2020 10:02:50 +0200 Subject: [PATCH] Change and harmonize scope(s) default values --- rtengine/procparams.cc | 16 ++++++++-------- rtgui/controlspotpanel.cc | 2 +- rtgui/locallabtools.cc | 4 ++-- rtgui/locallabtools2.cc | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 2c0386ff5..66e05effe 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2572,7 +2572,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : balan(1.0), balanh(1.0), colorde(5.0), - colorscope(15.0), + colorscope(30.0), transitweak(1.0), transitgrad(0.0), avoid(false), @@ -3060,7 +3060,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : expsoft(false), complexsoft(0), streng(0), - sensisf(15), + sensisf(30), laplace(25.), softMethod("soft"), // Blur & Noise @@ -3093,7 +3093,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : noisechrodetail(0.), adjblur(0), bilateral(0), - sensiden(20), + sensiden(60), detailthr(0), locwavcurveden{ static_cast(FCT_MinMaxCPoints), @@ -3195,7 +3195,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : scaltm(1.0), rewei(0), satur(0.), - sensitm(19), + sensitm(30), softradiustm(0.0), amount(95.), equiltm(true), @@ -3383,7 +3383,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : shardamping(0), shariter(30), sharblur(0.2), - sensisha(19), + sensisha(40), inverssha(false), // Local Contrast visicontrast(false), @@ -3429,7 +3429,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : thigw(0.0), edgw(60.0), basew(10.0), - sensilc(50), + sensilc(60), fftwlc(false), blurlc(true), wavblur(false), @@ -3589,7 +3589,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : mult{1.0, 1.0, 1.0, 1.0, 1.0, 1.0}, chromacbdl(0.), threshold(0.2), - sensicb(15), + sensicb(60), clarityml(0.1), contresid(0), blurcbdl(0.), @@ -3664,7 +3664,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : blackEv(-5.0), whiteEv(10.0), detail(0.6), - sensilog(50), + sensilog(60), baselog(2.), strlog(0.0), anglog(0.0) diff --git a/rtgui/controlspotpanel.cc b/rtgui/controlspotpanel.cc index 3472db683..24782f4ca 100644 --- a/rtgui/controlspotpanel.cc +++ b/rtgui/controlspotpanel.cc @@ -74,7 +74,7 @@ ControlSpotPanel::ControlSpotPanel(): 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-yellow-small.png")), Gtk::manage(new RTImage("circle-gray-green-small.png"))))), - colorscope_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_COLORSCOPE"), 0., 100.0, 1., 15.))), + colorscope_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_COLORSCOPE"), 0., 100.0, 1., 30.))), scopemask_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SCOPEMASK"), 0, 100, 1, 60))), lumask_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LUMASK"), 0, 30, 1, 10))), diff --git a/rtgui/locallabtools.cc b/rtgui/locallabtools.cc index 5df31feec..1164151bc 100644 --- a/rtgui/locallabtools.cc +++ b/rtgui/locallabtools.cc @@ -4835,7 +4835,7 @@ LocallabSoft::LocallabSoft(): showmasksoftMethod(Gtk::manage(new MyComboBoxText())), streng(Gtk::manage(new Adjuster(M("TP_LOCALLAB_STRENG"), 1, 100, 1, 1))), laplace(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LAPLACE"), 0., 100., 0.5, 25.))), - sensisf(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSI"), 1, 100, 1, 15))) + sensisf(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSI"), 1, 100, 1, 30))) { // Parameter Soft light specific widgets softMethod->append(M("TP_LOCALLAB_SOFTM")); @@ -5159,7 +5159,7 @@ LocallabBlur::LocallabBlur(): detailthr(Gtk::manage(new Adjuster(M("TP_LOCALLAB_DETAILTHR"), 0, 100, 1, 0))), adjblur(Gtk::manage(new Adjuster(M("TP_LOCALLAB_ADJ"), -100., 100., 1., 0., Gtk::manage(new RTImage("circle-blue-small.png")), Gtk::manage(new RTImage("circle-red-small.png"))))), bilateral(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BILATERAL"), 0, 100, 1, 0))), - sensiden(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSIDEN"), 0, 100, 1, 20))), + sensiden(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSIDEN"), 0, 100, 1, 60))), expmaskbl(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_SHOWPLUS")))), showmaskblMethod(Gtk::manage(new MyComboBoxText())), enablMask(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_ENABLE_MASK")))), diff --git a/rtgui/locallabtools2.cc b/rtgui/locallabtools2.cc index 17771b6d2..a457ca7cf 100644 --- a/rtgui/locallabtools2.cc +++ b/rtgui/locallabtools2.cc @@ -127,7 +127,7 @@ LocallabTone::LocallabTone(): scaltm(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SCALTM"), 0.1, 10.0, 0.01, 1.0))), rewei(Gtk::manage(new Adjuster(M("TP_LOCALLAB_REWEI"), 0, 3, 1, 0))), softradiustm(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SOFTRADIUSCOL"), -10.0, 1000.0, 0.1, 0.))), - sensitm(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSI"), 0, 100, 1, 15))), + sensitm(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSI"), 0, 100, 1, 30))), expmasktm(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_SHOWT")))), showmasktmMethod(Gtk::manage(new MyComboBoxText())), enatmMask(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_ENABLE_MASK")))), @@ -1732,7 +1732,7 @@ LocallabSharp::LocallabSharp(): shardamping(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHARDAMPING"), 0, 100, 1, 0))), shariter(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHARITER"), 5, 100, 1, 30))), sharblur(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHARBLUR"), 0.2, 2.0, 0.05, 0.2))), - sensisha(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSIS"), 0, 100, 1, 19))), + sensisha(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSIS"), 0, 100, 1, 40))), inverssha(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_INVERS")))), showmasksharMethod(Gtk::manage(new MyComboBoxText())) { @@ -2049,7 +2049,7 @@ LocallabContrast::LocallabContrast(): residshathr(Gtk::manage(new Adjuster(M("TP_LOCALLAB_RESIDSHATHR"), 0., 100., 1., 30.))), residhi(Gtk::manage(new Adjuster(M("TP_LOCALLAB_RESIDHI"), -100., 100., 1., 0.))), residhithr(Gtk::manage(new Adjuster(M("TP_LOCALLAB_RESIDHITHR"), 0., 100., 1., 70.))), - sensilc(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSIS"), 0, 100, 1, 50))), + sensilc(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSIS"), 0, 100, 1, 60))), clariFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_CLARIFRA")))), clarilres(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CLARILRES"), -20., 100., 0.5, 0.))), claricres(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CLARICRES"), -20., 100., 0.5, 0.))), @@ -3677,7 +3677,7 @@ LocallabCBDL::LocallabCBDL(): clarityml(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CLARITYML"), 0.1, 100., 0.1, 0.1))), contresid(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CONTRESID"), -100, 100, 1, 0))), softradiuscb(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SOFTRADIUSCOL"), -10.0, 1000.0, 0.5, 0.))), - sensicb(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSICB"), 0, 100, 1, 15))), + sensicb(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSICB"), 0, 100, 1, 60))), expmaskcb(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_SHOWCB")))), showmaskcbMethod(Gtk::manage(new MyComboBoxText())), enacbMask(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_ENABLE_MASK")))), @@ -4285,7 +4285,7 @@ LocallabLog::LocallabLog(): targetGray(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TARGET_GRAY"), 5.0, 80.0, 0.1, 18.0))), detail(Gtk::manage(new Adjuster(M("TP_LOCALLAB_DETAIL"), 0., 1., 0.01, 0.6))), baselog(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BASELOG"), 1.3, 8., 0.05, 2., Gtk::manage(new RTImage("circle-black-small.png")), Gtk::manage(new RTImage("circle-white-small.png"))))), - sensilog(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSILOG"), 0, 100, 1, 50))), + sensilog(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSILOG"), 0, 100, 1, 60))), strlog(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADSTR"), -2.0, 2.0, 0.05, 0.))), anglog(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GRADANG"), -180, 180, 0.1, 0.))) {