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

Fix for NR gamma, NR Ldetail history message and History NR decimal values

Browse Source
This commit is contained in:
michael
2012-03-15 23:40:49 -04:00
parent b01fa83148
commit 3c95953725
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtdata/languages/default
View File

@@ -383,6 +383,7 @@ HISTORY_MSG_163;RGB Curves - R
HISTORY_MSG_164;RGB Curves - G HISTORY_MSG_164;RGB Curves - G
HISTORY_MSG_165;RGB Curves - B HISTORY_MSG_165;RGB Curves - B
HISTORY_MSG_166;Neutral levels HISTORY_MSG_166;Neutral levels
HISTORY_MSG_166;NR - luminance detail
HISTORY_NEWSNAPSHOTAS;As... HISTORY_NEWSNAPSHOTAS;As...
HISTORY_NEWSNAPSHOT;Add HISTORY_NEWSNAPSHOT;Add
HISTORY_NEWSSDIALOGLABEL;Label of the snapshot: HISTORY_NEWSSDIALOGLABEL;Label of the snapshot:

2
rtengine/procparams.h
View File

@@ -244,7 +244,7 @@ class WBParams {
double luma; double luma;
double Ldetail; double Ldetail;
double chroma; double chroma;
float gamma; double gamma;
double expcomp; double expcomp;
}; };

31
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, 20)); 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)); 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)); 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)); 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);
@@ -79,7 +79,7 @@ void DirPyrDenoise::read (const ProcParams* pp, const ParamsEdited* pedited) {
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);
enableListener (); enableListener ();
} }
@@ -95,9 +95,9 @@ void DirPyrDenoise::write (ProcParams* pp, ParamsEdited* pedited) {
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();
} }
} }
@@ -106,10 +106,10 @@ void DirPyrDenoise::setDefaults (const ProcParams* defParams, const ParamsEdited
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.gamma);
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);
@@ -124,16 +124,18 @@ void DirPyrDenoise::setDefaults (const ProcParams* defParams, const ParamsEdited
void DirPyrDenoise::adjusterChanged (Adjuster* a, double newval) { void DirPyrDenoise::adjusterChanged (Adjuster* a, double newval) {
if (listener && enabled->get_active()) { Glib::ustring costr;
costr = Glib::ustring::format (std::setw(3), std::fixed, std::setprecision(2), a->getValue());
if (listener && enabled->get_active()) {
if (a==Ldetail) if (a==Ldetail)
listener->panelChanged (EvDPDNLdetail, Glib::ustring::format ((int)a->getValue())); listener->panelChanged (EvDPDNLdetail, costr);
else if (a==luma) else if (a==luma)
listener->panelChanged (EvDPDNLuma, Glib::ustring::format ((int)a->getValue())); listener->panelChanged (EvDPDNLuma, costr);
else if (a==chroma) else if (a==chroma)
listener->panelChanged (EvDPDNChroma, Glib::ustring::format ((int)a->getValue())); listener->panelChanged (EvDPDNChroma, costr);
else if (a==gamma) else if (a==gamma)
listener->panelChanged (EvDPDNGamma, Glib::ustring::format (std::setw(2), std::fixed, std::setprecision(2), a->getValue())); listener->panelChanged (EvDPDNGamma, costr);
} }
} }
@@ -166,6 +168,7 @@ void DirPyrDenoise::setBatchMode (bool batchMode) {
luma->showEditedCB (); luma->showEditedCB ();
Ldetail->showEditedCB (); Ldetail->showEditedCB ();
chroma->showEditedCB (); chroma->showEditedCB ();
gamma->showEditedCB ();
} }
void DirPyrDenoise::setAdjusterBehavior (bool chrolumaadd, bool gammaadd) { void DirPyrDenoise::setAdjusterBehavior (bool chrolumaadd, bool gammaadd) {