From cb5e99ef62e4163a9a35ed1c8a1d1468fd308fb8 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 10 Jul 2016 21:22:12 +0200 Subject: [PATCH] Updated defaults for crop, sharpening and post-resize sharpening. --- rtengine/procparams.cc | 8 ++++---- rtgui/prsharpening.cc | 10 +++++----- rtgui/sharpening.cc | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 60a54baf5..70b764da1 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -1038,8 +1038,8 @@ void ProcParams::setDefaults () prsharpening.edges_tolerance = 1800; prsharpening.halocontrol = false; prsharpening.halocontrol_amount = 85; - prsharpening.method = "usm"; - prsharpening.deconvradius = 0.5; + prsharpening.method = "rld"; + prsharpening.deconvradius = 0.45; prsharpening.deconviter = 100; prsharpening.deconvdamping = 0; prsharpening.deconvamount = 100; @@ -1149,10 +1149,10 @@ void ProcParams::setDefaults () crop.y = -1; crop.w = 15000; crop.h = 15000; - crop.fixratio = false; + crop.fixratio = true; crop.ratio = "3:2"; crop.orientation = "As Image"; - crop.guide = "Rule of thirds"; + crop.guide = "Frame"; coarse.setDefaults(); diff --git a/rtgui/prsharpening.cc b/rtgui/prsharpening.cc index efc00c95f..7dd097a90 100644 --- a/rtgui/prsharpening.cc +++ b/rtgui/prsharpening.cc @@ -45,10 +45,10 @@ PrSharpening::PrSharpening () : FoldableToolPanel(this, "prsharpening", M("TP_PR pack_start (*hb); rld = new Gtk::VBox (); - dradius = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDRADIUS"), 0.4, 2.5, 0.01, 0.75)); - damount = Gtk::manage (new Adjuster (M("TP_SHARPENING_RLD_AMOUNT"), 0.0, 100, 1, 75)); - ddamping = Gtk::manage (new Adjuster (M("TP_SHARPENING_RLD_DAMPING"), 0, 100, 1, 20)); - diter = Gtk::manage (new Adjuster (M("TP_SHARPENING_RLD_ITERATIONS"), 5, 100, 1, 30)); + dradius = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDRADIUS"), 0.4, 2.5, 0.01, 0.45)); + damount = Gtk::manage (new Adjuster (M("TP_SHARPENING_RLD_AMOUNT"), 0.0, 100, 1, 100)); + ddamping = Gtk::manage (new Adjuster (M("TP_SHARPENING_RLD_DAMPING"), 0, 100, 1, 0)); + diter = Gtk::manage (new Adjuster (M("TP_SHARPENING_RLD_ITERATIONS"), 5, 100, 1, 100)); rld->pack_start (*dradius); rld->pack_start (*damount); rld->pack_start (*ddamping); @@ -85,7 +85,7 @@ PrSharpening::PrSharpening () : FoldableToolPanel(this, "prsharpening", M("TP_PR edgesonly->set_active (false); edgebox = new Gtk::VBox (); eradius = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDRADIUS"), 0.5, 2.5, 0.1, 1.9)); - etolerance = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDTOLERANCE"), 10, 10000, 100, 1000)); + etolerance = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDTOLERANCE"), 10, 10000, 100, 1800)); usm->pack_start(*hsep6, Gtk::PACK_SHRINK, 2); usm->pack_start(*edgesonly); edgebox->pack_start(*eradius); diff --git a/rtgui/sharpening.cc b/rtgui/sharpening.cc index 09207a883..6af30c68b 100644 --- a/rtgui/sharpening.cc +++ b/rtgui/sharpening.cc @@ -81,7 +81,7 @@ Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENI edgesonly->set_active (false); edgebox = new Gtk::VBox (); eradius = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDRADIUS"), 0.5, 2.5, 0.1, 1.9)); - etolerance = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDTOLERANCE"), 10, 10000, 100, 1000)); + etolerance = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDTOLERANCE"), 10, 10000, 100, 1800)); usm->pack_start(*hsep6, Gtk::PACK_SHRINK, 2); usm->pack_start(*edgesonly); edgebox->pack_start(*eradius);