Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2016-07-10 21:42:28 +02:00
21 changed files with 7382 additions and 2388 deletions

View File

@@ -18,7 +18,6 @@
*/
#include "prsharpening.h"
#include <cmath>
#include "guiutils.h"
using namespace rtengine;
using namespace rtengine::procparams;
@@ -45,10 +44,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.5, 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 +84,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);