From 17d60e12b07854dd7f053cf34d7cbb2bd679ab61 Mon Sep 17 00:00:00 2001 From: DrSlony Date: Tue, 26 Jun 2012 21:08:12 +0100 Subject: [PATCH] "Reset to default" values synchronized with the "Default" profile --- rtgui/dirpyrdenoise.cc | 8 ++++---- rtgui/dirpyrequalizer.cc | 13 ++++++++----- rtgui/impulsedenoise.cc | 2 +- rtgui/labcurve.cc | 4 ++-- rtgui/rawprocess.cc | 2 +- rtgui/shadowshighlights.cc | 4 ++-- rtgui/sharpenedge.cc | 4 ++-- rtgui/sharpening.cc | 4 ++-- rtgui/sharpenmicro.cc | 2 +- rtgui/thresholdselector.cc | 2 +- rtgui/vibrance.cc | 6 +++--- 11 files changed, 27 insertions(+), 24 deletions(-) diff --git a/rtgui/dirpyrdenoise.cc b/rtgui/dirpyrdenoise.cc index 420f12796..2e8773d54 100644 --- a/rtgui/dirpyrdenoise.cc +++ b/rtgui/dirpyrdenoise.cc @@ -36,9 +36,9 @@ DirPyrDenoise::DirPyrDenoise () : Gtk::VBox(), FoldableToolPanel(this) { enaConn = enabled->signal_toggled().connect( sigc::mem_fun(*this, &DirPyrDenoise::enabledChanged) ); - luma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_LUMA"), 0, 100, 1, 10)); - chroma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_CHROMA"), 0, 100, 1, 10)); - gamma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_GAMMA"), 1.0, 3.0, 0.01, 0.10)); + luma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_LUMA"), 0, 100, 1, 5)); + chroma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_CHROMA"), 0, 100, 1, 5)); + gamma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_GAMMA"), 1.0, 3.0, 0.01, 2.0)); luma->setAdjusterListener (this); chroma->setAdjusterListener (this); @@ -97,7 +97,7 @@ void DirPyrDenoise::setDefaults (const ProcParams* defParams, const ParamsEdited luma->setDefault (defParams->dirpyrDenoise.luma); chroma->setDefault (defParams->dirpyrDenoise.chroma); - gamma->setDefault (defParams->dirpyrDenoise.chroma); + gamma->setDefault (defParams->dirpyrDenoise.gamma); if (pedited) { luma->setDefaultEditedState (pedited->dirpyrDenoise.luma ? Edited : UnEdited); diff --git a/rtgui/dirpyrequalizer.cc b/rtgui/dirpyrequalizer.cc index 0e28e0045..1ff0540b6 100644 --- a/rtgui/dirpyrequalizer.cc +++ b/rtgui/dirpyrequalizer.cc @@ -56,11 +56,14 @@ DirPyrEqualizer::DirPyrEqualizer () : Gtk::VBox(), FoldableToolPanel(this) { { Glib::ustring ss; ss = Glib::ustring::format(i); - if(i == 0) + if(i == 0) { ss += Glib::ustring::compose(" (%1)", M("TP_DIRPYREQUALIZER_LUMAFINEST")); - if(i == 3) - ss += Glib::ustring::compose(" (%1)", M("TP_DIRPYREQUALIZER_LUMACOARSEST")); - multiplier[i] = Gtk::manage ( new Adjuster (ss, 0, 4, 0.01, 1.0) ); + multiplier[i] = Gtk::manage ( new Adjuster (ss, 0, 4, 0.01, 3.0) ); + } else { + if(i == 3) + ss += Glib::ustring::compose(" (%1)", M("TP_DIRPYREQUALIZER_LUMACOARSEST")); + multiplier[i] = Gtk::manage ( new Adjuster (ss, 0, 4, 0.01, 1.0) ); + } multiplier[i]->setAdjusterListener(this); pack_start(*multiplier[i]); } @@ -68,7 +71,7 @@ DirPyrEqualizer::DirPyrEqualizer () : Gtk::VBox(), FoldableToolPanel(this) { Gtk::HSeparator *separator3 = Gtk::manage (new Gtk::HSeparator()); pack_start(*separator3, Gtk::PACK_SHRINK, 2); - multiplier[4] = Gtk::manage ( new Adjuster (M("TP_DIRPYREQUALIZER_THRESHOLD"), 0, 1, 0.01, 0.0) ); + multiplier[4] = Gtk::manage ( new Adjuster (M("TP_DIRPYREQUALIZER_THRESHOLD"), 0, 1, 0.01, 0.2) ); multiplier[4]->setAdjusterListener(this); pack_start(*multiplier[4]); diff --git a/rtgui/impulsedenoise.cc b/rtgui/impulsedenoise.cc index 6f24b4dc5..70ab7315d 100644 --- a/rtgui/impulsedenoise.cc +++ b/rtgui/impulsedenoise.cc @@ -29,7 +29,7 @@ ImpulseDenoise::ImpulseDenoise () : Gtk::VBox(), FoldableToolPanel(this) { enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED"))); enabled->set_active (false); - thresh = Gtk::manage (new Adjuster (M("TP_IMPULSEDENOISE_THRESH"), 0, 100, 1, 10)); + thresh = Gtk::manage (new Adjuster (M("TP_IMPULSEDENOISE_THRESH"), 0, 100, 1, 50)); pack_start (*enabled); pack_start (*Gtk::manage (new Gtk::HSeparator())); diff --git a/rtgui/labcurve.cc b/rtgui/labcurve.cc index 6a1c73e1d..c245a1c3b 100644 --- a/rtgui/labcurve.cc +++ b/rtgui/labcurve.cc @@ -26,7 +26,7 @@ LCurve::LCurve () : Gtk::VBox(), FoldableToolPanel(this) { brightness = Gtk::manage (new Adjuster (M("TP_LABCURVE_BRIGHTNESS"), -100, 100, 1, 0)); contrast = Gtk::manage (new Adjuster (M("TP_LABCURVE_CONTRAST"), -100, 100, 1, 0)); - saturation = Gtk::manage (new Adjuster (M("TP_LABCURVE_SATURATION"), -100, 100, 1, 0)); + saturation = Gtk::manage (new Adjuster (M("TP_LABCURVE_SATURATION"), -100, 100, 1, 5)); pack_start (*brightness); brightness->show (); @@ -56,7 +56,7 @@ LCurve::LCurve () : Gtk::VBox(), FoldableToolPanel(this) { enablelimiter = Gtk::manage (new Gtk::CheckButton (M("TP_LABCURVE_ENABLESATLIMITER"))); pack_start (*enablelimiter); - saturationlimiter = Gtk::manage ( new Adjuster (M("TP_LABCURVE_SATLIMIT"), 0, 100, 1.0, 40) ); + saturationlimiter = Gtk::manage ( new Adjuster (M("TP_LABCURVE_SATLIMIT"), 0, 100, 1.0, 50) ); pack_start (*saturationlimiter); saturationlimiter->show (); saturationlimiter->reference (); diff --git a/rtgui/rawprocess.cc b/rtgui/rawprocess.cc index 79e2c5c20..e0b83b1d8 100644 --- a/rtgui/rawprocess.cc +++ b/rtgui/rawprocess.cc @@ -49,7 +49,7 @@ RawProcess::RawProcess () : Gtk::VBox(), FoldableToolPanel(this) ccOptions = Gtk::manage (new Gtk::VBox ()); ccOptions->set_border_width(4); - ccSteps = Gtk::manage (new Adjuster (M("TP_RAW_FALSECOLOR"),0,5,1,2 )); + ccSteps = Gtk::manage (new Adjuster (M("TP_RAW_FALSECOLOR"),0,5,1,0 )); ccSteps->setAdjusterListener (this); if (ccSteps->delay < 1000) ccSteps->delay = 1000; ccSteps->show(); diff --git a/rtgui/shadowshighlights.cc b/rtgui/shadowshighlights.cc index c0464d8c6..3d6966780 100644 --- a/rtgui/shadowshighlights.cc +++ b/rtgui/shadowshighlights.cc @@ -36,14 +36,14 @@ ShadowsHighlights::ShadowsHighlights () : Gtk::VBox(), FoldableToolPanel(this) { hqConn = hq->signal_toggled().connect( sigc::mem_fun(*this, &ShadowsHighlights::hqChanged) ); pack_start (*Gtk::manage (new Gtk::HSeparator())); - highlights = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_HIGHLIGHTS"), 0, 100, 1, 0)); + highlights = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_HIGHLIGHTS"), 0, 100, 1, 10)); h_tonalwidth = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_HLTONALW"), 10, 100, 1, 80)); pack_start (*highlights); pack_start (*h_tonalwidth); pack_start (*Gtk::manage (new Gtk::HSeparator())); - shadows = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_SHADOWS"), 0, 100, 1, 0)); + shadows = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_SHADOWS"), 0, 100, 1, 10)); s_tonalwidth = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_SHTONALW"), 10, 100, 1, 80)); pack_start (*shadows); pack_start (*s_tonalwidth); diff --git a/rtgui/sharpenedge.cc b/rtgui/sharpenedge.cc index 99066a199..5f8d3387b 100644 --- a/rtgui/sharpenedge.cc +++ b/rtgui/sharpenedge.cc @@ -32,10 +32,10 @@ SharpenEdge::SharpenEdge () : Gtk::VBox(), FoldableToolPanel(this) { enabled->set_active (true); pack_start(*enabled, Gtk::PACK_SHRINK, 0); - passes = Gtk::manage(new Adjuster (M("TP_SHARPENEDGE_PASSES"),1,4,1,1)); + passes = Gtk::manage(new Adjuster (M("TP_SHARPENEDGE_PASSES"),1,4,1,2)); passes->setAdjusterListener (this); if (passes->delay < 1000) passes->delay = 1000; - amount = Gtk::manage(new Adjuster (M("TP_SHARPENEDGE_AMOUNT"),0,100,1,40)); + amount = Gtk::manage(new Adjuster (M("TP_SHARPENEDGE_AMOUNT"),0,100,1,50)); amount->setAdjusterListener (this); if (amount->delay < 1000) amount->delay = 1000; diff --git a/rtgui/sharpening.cc b/rtgui/sharpening.cc index 9f16086f3..ee8328426 100644 --- a/rtgui/sharpening.cc +++ b/rtgui/sharpening.cc @@ -71,8 +71,8 @@ Sharpening::Sharpening () : Gtk::VBox(), FoldableToolPanel(this) { Gtk::HSeparator *hsep6a = Gtk::manage (new Gtk::HSeparator()); - amount = Gtk::manage (new Adjuster (M("TP_SHARPENING_AMOUNT"), 1, 1000, 1, 150)); - radius = Gtk::manage (new Adjuster (M("TP_SHARPENING_RADIUS"), 0.3, 3, 0.01, 0.8)); + amount = Gtk::manage (new Adjuster (M("TP_SHARPENING_AMOUNT"), 1, 1000, 1, 125)); + radius = Gtk::manage (new Adjuster (M("TP_SHARPENING_RADIUS"), 0.3, 3, 0.01, 0.5)); threshold = Gtk::manage (new ThresholdAdjuster (M("TP_SHARPENING_THRESHOLD"), 0., 2000., 20., 80., 2000., 1200., 0, false)); threshold->setBgGradient(milestones); pack_start(*hsep6a, Gtk::PACK_SHRINK, 2); diff --git a/rtgui/sharpenmicro.cc b/rtgui/sharpenmicro.cc index a2af6867e..ccab3a638 100644 --- a/rtgui/sharpenmicro.cc +++ b/rtgui/sharpenmicro.cc @@ -33,7 +33,7 @@ SharpenMicro::SharpenMicro () : Gtk::VBox(), FoldableToolPanel(this) { pack_start(*enabled, Gtk::PACK_SHRINK, 0); enabled->show (); - amount= Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_AMOUNT"),0,100,1,25)); + amount= Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_AMOUNT"),0,100,1,20)); amount->setAdjusterListener (this); if (amount->delay < 1000) amount->delay = 1000; amount->show(); diff --git a/rtgui/thresholdselector.cc b/rtgui/thresholdselector.cc index 562fbb3fe..5dcc39843 100644 --- a/rtgui/thresholdselector.cc +++ b/rtgui/thresholdselector.cc @@ -532,7 +532,7 @@ void ThresholdSelector::reset () { positions[0] = defPos[0]; positions[1] = defPos[1]; positions[2] = defPos[2]; - positions[2] = defPos[3]; + positions[3] = defPos[3]; updateTooltip(); queue_draw (); } diff --git a/rtgui/vibrance.cc b/rtgui/vibrance.cc index 3c0547fa7..589009c08 100644 --- a/rtgui/vibrance.cc +++ b/rtgui/vibrance.cc @@ -28,18 +28,18 @@ Vibrance::Vibrance () : Gtk::VBox(), FoldableToolPanel(this) { enabled->set_active (false); pack_start(*enabled, Gtk::PACK_SHRINK, 0); - pastels = Gtk::manage(new Adjuster (M("TP_VIBRANCE_PASTELS"),-100,100,5,0)); + pastels = Gtk::manage(new Adjuster (M("TP_VIBRANCE_PASTELS"),-100,100,5,50)); pastels->setAdjusterListener (this); //if (pastels->delay < 1000) pastels->delay = 1000; pack_start( *pastels, Gtk::PACK_SHRINK, 0); - saturated = Gtk::manage(new Adjuster (M("TP_VIBRANCE_SATURATED"),-100,100,5,0)); + saturated = Gtk::manage(new Adjuster (M("TP_VIBRANCE_SATURATED"),-100,100,5,50)); saturated->setAdjusterListener (this); saturated->set_sensitive(false); //if (saturated->delay < 1000) saturated->delay = 1000; pack_start( *saturated, Gtk::PACK_SHRINK, 0); - psThreshold = Gtk::manage (new ThresholdAdjuster (M("TP_VIBRANCE_PSTHRESHOLD"), 0., 100., 75., 75., 0, false)); + psThreshold = Gtk::manage (new ThresholdAdjuster (M("TP_VIBRANCE_PSTHRESHOLD"), 0., 100., 1., 75., 0, false)); psThreshold->setAdjusterListener (this); psThreshold->set_sensitive(false); //if (psThreshold->delay < 1000) psThreshold->delay = 1000;