liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for NR GUI defaults, label & a little code pretification

Browse Source
This commit is contained in:
michael
2012-03-15 22:36:41 -04:00
parent 25417b2d36
commit b01fa83148
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtdata/languages/default
View File

@@ -851,6 +851,7 @@ TP_DETAIL_AMOUNT;Amount
TP_DIRPYRDENOISE_CHROMA;Chrominance TP_DIRPYRDENOISE_CHROMA;Chrominance
TP_DIRPYRDENOISE_GAMMA;Gamma TP_DIRPYRDENOISE_GAMMA;Gamma
TP_DIRPYRDENOISE_LABEL;Noise reduction TP_DIRPYRDENOISE_LABEL;Noise reduction
TP_DIRPYRDENOISE_LDETAIL;Luminance detail
TP_DIRPYRDENOISE_LUMA;Luminance TP_DIRPYRDENOISE_LUMA;Luminance
TP_DIRPYREQUALIZER_LABEL;Contrast by detail levels TP_DIRPYREQUALIZER_LABEL;Contrast by detail levels
TP_DIRPYREQUALIZER_LUMACOARSEST;Coarsest TP_DIRPYREQUALIZER_LUMACOARSEST;Coarsest

34
rtgui/dirpyrdenoise.cc
View File

@@ -36,10 +36,10 @@ DirPyrDenoise::DirPyrDenoise () : Gtk::VBox(), FoldableToolPanel(this) {
enaConn = enabled->signal_toggled().connect( sigc::mem_fun(*this, &DirPyrDenoise::enabledChanged) ); 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)); 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, 10)); 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, 10)); 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, 0.10)); gamma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_GAMMA"), 1.0, 3.0, 0.01, 1.7));
luma->setAdjusterListener (this); luma->setAdjusterListener (this);
Ldetail->setAdjusterListener (this); Ldetail->setAdjusterListener (this);
@@ -64,7 +64,7 @@ void DirPyrDenoise::read (const ProcParams* pp, const ParamsEdited* pedited) {
if (pedited) { if (pedited) {
luma->setEditedState (pedited->dirpyrDenoise.luma ? Edited : UnEdited); 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); chroma->setEditedState (pedited->dirpyrDenoise.chroma ? Edited : UnEdited);
gamma->setEditedState (pedited->dirpyrDenoise.gamma ? Edited : UnEdited); gamma->setEditedState (pedited->dirpyrDenoise.gamma ? Edited : UnEdited);
enabled->set_inconsistent (!pedited->dirpyrDenoise.enabled); enabled->set_inconsistent (!pedited->dirpyrDenoise.enabled);
@@ -77,7 +77,7 @@ void DirPyrDenoise::read (const ProcParams* pp, const ParamsEdited* pedited) {
lastEnabled = pp->dirpyrDenoise.enabled; lastEnabled = pp->dirpyrDenoise.enabled;
luma->setValue (pp->dirpyrDenoise.luma); luma->setValue (pp->dirpyrDenoise.luma);
Ldetail->setValue (pp->dirpyrDenoise.Ldetail); Ldetail->setValue (pp->dirpyrDenoise.Ldetail);
chroma->setValue (pp->dirpyrDenoise.chroma); chroma->setValue (pp->dirpyrDenoise.chroma);
gamma->setValue (pp->dirpyrDenoise.gamma); 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) { void DirPyrDenoise::write (ProcParams* pp, ParamsEdited* pedited) {
pp->dirpyrDenoise.luma = luma->getValue (); pp->dirpyrDenoise.luma = luma->getValue ();
pp->dirpyrDenoise.Ldetail = Ldetail->getValue (); pp->dirpyrDenoise.Ldetail = Ldetail->getValue ();
pp->dirpyrDenoise.chroma = chroma->getValue (); pp->dirpyrDenoise.chroma = chroma->getValue ();
pp->dirpyrDenoise.gamma = gamma->getValue (); pp->dirpyrDenoise.gamma = gamma->getValue ();
pp->dirpyrDenoise.enabled = enabled->get_active(); pp->dirpyrDenoise.enabled = enabled->get_active();
if (pedited) { if (pedited) {
pedited->dirpyrDenoise.luma = luma->getEditedState (); pedited->dirpyrDenoise.luma = luma->getEditedState ();
pedited->dirpyrDenoise.Ldetail = Ldetail->getEditedState (); pedited->dirpyrDenoise.Ldetail = Ldetail->getEditedState ();
pedited->dirpyrDenoise.chroma = chroma->getEditedState (); pedited->dirpyrDenoise.chroma = chroma->getEditedState ();
pedited->dirpyrDenoise.gamma = gamma->getEditedState (); pedited->dirpyrDenoise.gamma = gamma->getEditedState ();
pedited->dirpyrDenoise.enabled = !enabled->get_inconsistent(); 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) { void DirPyrDenoise::setDefaults (const ProcParams* defParams, const ParamsEdited* pedited) {
luma->setDefault (defParams->dirpyrDenoise.luma); luma->setDefault (defParams->dirpyrDenoise.luma);
Ldetail->setDefault (defParams->dirpyrDenoise.Ldetail); Ldetail->setDefault (defParams->dirpyrDenoise.Ldetail);
chroma->setDefault (defParams->dirpyrDenoise.chroma); chroma->setDefault (defParams->dirpyrDenoise.chroma);
gamma->setDefault (defParams->dirpyrDenoise.chroma); gamma->setDefault (defParams->dirpyrDenoise.chroma);
if (pedited) { if (pedited) {
luma->setDefaultEditedState (pedited->dirpyrDenoise.luma ? Edited : UnEdited); 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); chroma->setDefaultEditedState (pedited->dirpyrDenoise.chroma ? Edited : UnEdited);
gamma->setDefaultEditedState (pedited->dirpyrDenoise.gamma ? Edited : UnEdited); gamma->setDefaultEditedState (pedited->dirpyrDenoise.gamma ? Edited : UnEdited);
} }
else { else {
luma->setDefaultEditedState (Irrelevant); luma->setDefaultEditedState (Irrelevant);
Ldetail->setDefaultEditedState (Irrelevant); Ldetail->setDefaultEditedState (Irrelevant);
chroma->setDefaultEditedState (Irrelevant); chroma->setDefaultEditedState (Irrelevant);
gamma->setDefaultEditedState (Irrelevant); gamma->setDefaultEditedState (Irrelevant);
} }
} }