From b01fa831485cd6280a7a4ce2e9e2bdf5e9302799 Mon Sep 17 00:00:00 2001 From: michael Date: Thu, 15 Mar 2012 22:36:41 -0400 Subject: [PATCH] Fix for NR GUI defaults, label & a little code pretification --- rtdata/languages/default | 1 + rtgui/dirpyrdenoise.cc | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index bfa94fe7e..5a92f4d29 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -851,6 +851,7 @@ TP_DETAIL_AMOUNT;Amount TP_DIRPYRDENOISE_CHROMA;Chrominance TP_DIRPYRDENOISE_GAMMA;Gamma TP_DIRPYRDENOISE_LABEL;Noise reduction +TP_DIRPYRDENOISE_LDETAIL;Luminance detail TP_DIRPYRDENOISE_LUMA;Luminance TP_DIRPYREQUALIZER_LABEL;Contrast by detail levels TP_DIRPYREQUALIZER_LUMACOARSEST;Coarsest diff --git a/rtgui/dirpyrdenoise.cc b/rtgui/dirpyrdenoise.cc index 6443581a9..846b95daa 100644 --- a/rtgui/dirpyrdenoise.cc +++ b/rtgui/dirpyrdenoise.cc @@ -36,10 +36,10 @@ 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, 0.01, 10)); - Ldetail = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_LDETAIL"), 0, 100, 0.01, 10)); - chroma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_CHROMA"), 0, 100, 0.01, 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, 0.01, 20)); + Ldetail = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_LDETAIL"), 0, 100, 0.01, 50)); + chroma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_CHROMA"), 0, 100, 0.01, 20)); + gamma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_GAMMA"), 1.0, 3.0, 0.01, 1.7)); luma->setAdjusterListener (this); Ldetail->setAdjusterListener (this); @@ -64,7 +64,7 @@ void DirPyrDenoise::read (const ProcParams* pp, const ParamsEdited* pedited) { if (pedited) { luma->setEditedState (pedited->dirpyrDenoise.luma ? Edited : UnEdited); - Ldetail->setEditedState (pedited->dirpyrDenoise.Ldetail ? Edited : UnEdited); + Ldetail->setEditedState (pedited->dirpyrDenoise.Ldetail ? Edited : UnEdited); chroma->setEditedState (pedited->dirpyrDenoise.chroma ? Edited : UnEdited); gamma->setEditedState (pedited->dirpyrDenoise.gamma ? Edited : UnEdited); enabled->set_inconsistent (!pedited->dirpyrDenoise.enabled); @@ -77,7 +77,7 @@ void DirPyrDenoise::read (const ProcParams* pp, const ParamsEdited* pedited) { lastEnabled = pp->dirpyrDenoise.enabled; luma->setValue (pp->dirpyrDenoise.luma); - Ldetail->setValue (pp->dirpyrDenoise.Ldetail); + Ldetail->setValue (pp->dirpyrDenoise.Ldetail); chroma->setValue (pp->dirpyrDenoise.chroma); gamma->setValue (pp->dirpyrDenoise.gamma); @@ -87,14 +87,14 @@ void DirPyrDenoise::read (const ProcParams* pp, const ParamsEdited* pedited) { void DirPyrDenoise::write (ProcParams* pp, ParamsEdited* pedited) { pp->dirpyrDenoise.luma = luma->getValue (); - pp->dirpyrDenoise.Ldetail = Ldetail->getValue (); + pp->dirpyrDenoise.Ldetail = Ldetail->getValue (); pp->dirpyrDenoise.chroma = chroma->getValue (); pp->dirpyrDenoise.gamma = gamma->getValue (); pp->dirpyrDenoise.enabled = enabled->get_active(); if (pedited) { pedited->dirpyrDenoise.luma = luma->getEditedState (); - pedited->dirpyrDenoise.Ldetail = Ldetail->getEditedState (); + pedited->dirpyrDenoise.Ldetail = Ldetail->getEditedState (); pedited->dirpyrDenoise.chroma = chroma->getEditedState (); pedited->dirpyrDenoise.gamma = gamma->getEditedState (); pedited->dirpyrDenoise.enabled = !enabled->get_inconsistent(); @@ -103,22 +103,22 @@ void DirPyrDenoise::write (ProcParams* pp, ParamsEdited* pedited) { void DirPyrDenoise::setDefaults (const ProcParams* defParams, const ParamsEdited* pedited) { - luma->setDefault (defParams->dirpyrDenoise.luma); - Ldetail->setDefault (defParams->dirpyrDenoise.Ldetail); - chroma->setDefault (defParams->dirpyrDenoise.chroma); - gamma->setDefault (defParams->dirpyrDenoise.chroma); + luma->setDefault (defParams->dirpyrDenoise.luma); + Ldetail->setDefault (defParams->dirpyrDenoise.Ldetail); + chroma->setDefault (defParams->dirpyrDenoise.chroma); + gamma->setDefault (defParams->dirpyrDenoise.chroma); if (pedited) { luma->setDefaultEditedState (pedited->dirpyrDenoise.luma ? Edited : UnEdited); - Ldetail->setDefaultEditedState (pedited->dirpyrDenoise.Ldetail ? Edited : UnEdited); + Ldetail->setDefaultEditedState (pedited->dirpyrDenoise.Ldetail ? Edited : UnEdited); chroma->setDefaultEditedState (pedited->dirpyrDenoise.chroma ? Edited : UnEdited); gamma->setDefaultEditedState (pedited->dirpyrDenoise.gamma ? Edited : UnEdited); } else { - luma->setDefaultEditedState (Irrelevant); - Ldetail->setDefaultEditedState (Irrelevant); - chroma->setDefaultEditedState (Irrelevant); - gamma->setDefaultEditedState (Irrelevant); + luma->setDefaultEditedState (Irrelevant); + Ldetail->setDefaultEditedState (Irrelevant); + chroma->setDefaultEditedState (Irrelevant); + gamma->setDefaultEditedState (Irrelevant); } }