Noise Colour Chanels Lab mode see issue1734
This commit is contained in:
jdc
@@ -28,6 +28,8 @@ DirPyrDenoise::DirPyrDenoise () : Gtk::VBox(), FoldableToolPanel(this) {
|
||||
set_border_width(4);
|
||||
|
||||
enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED")));
|
||||
enabled->set_tooltip_text (M("TP_DIRPYRDENOISE_ENABLED_TOOLTIP"));
|
||||
|
||||
enabled->set_active (false);
|
||||
enabled->show ();
|
||||
pack_start (*enabled);
|
||||
@@ -40,25 +42,57 @@ DirPyrDenoise::DirPyrDenoise () : Gtk::VBox(), FoldableToolPanel(this) {
|
||||
|
||||
|
||||
luma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_LUMA"), 0, 100, 0.01, 0));
|
||||
Ldetail = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_LDETAIL"), 0, 100, 0.01, 80));
|
||||
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, 15));
|
||||
redchro = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_RED"), -100, 100, 0.1, 0));
|
||||
bluechro = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_BLUE"), -100, 100, 0.1, 0));
|
||||
|
||||
gamma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_GAMMA"), 1.0, 3.0, 0.01, 1.7));
|
||||
gamma->set_tooltip_text (M("TP_DIRPYRDENOISE_GAMMA_TOOLTIP"));
|
||||
|
||||
Gtk::HBox* hb1 = Gtk::manage (new Gtk::HBox ());
|
||||
hb1->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_DIRPYRDENOISE_METHOD") +": ")),Gtk::PACK_SHRINK, 4);
|
||||
hb1->set_tooltip_markup (M("TP_DIRPYRDENOISE_METHOD_TOOLTIP"));
|
||||
|
||||
dmethod = Gtk::manage (new MyComboBoxText ());
|
||||
dmethod->append_text (M("TP_DIRPYRDENOISE_RGB"));
|
||||
dmethod->append_text (M("TP_DIRPYRDENOISE_LAB"));
|
||||
dmethod->set_active(0);
|
||||
hb1->pack_end (*dmethod, Gtk::PACK_EXPAND_WIDGET, 4);
|
||||
pack_start( *hb1, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
|
||||
// perform = Gtk::manage (new Gtk::CheckButton (M("TP_DIRPYRDENOISE_PERF")));
|
||||
// perform->set_tooltip_text (M("TP_DIRPYRDENOISE_PERF_TOOLTIP"));
|
||||
|
||||
// perfconn = perform->signal_toggled().connect( sigc::mem_fun(*this, &DirPyrDenoise::perform_toggled) );
|
||||
dmethodconn = dmethod->signal_changed().connect ( sigc::mem_fun(*this, &DirPyrDenoise::dmethodChanged) );
|
||||
|
||||
luma->setAdjusterListener (this);
|
||||
Ldetail->setAdjusterListener (this);
|
||||
chroma->setAdjusterListener (this);
|
||||
redchro->setAdjusterListener (this);
|
||||
bluechro->setAdjusterListener (this);
|
||||
|
||||
gamma->setAdjusterListener (this);
|
||||
|
||||
luma->show();
|
||||
Ldetail->show();
|
||||
chroma->show();
|
||||
redchro->show();
|
||||
bluechro->show();
|
||||
// perform->show();
|
||||
gamma->show();
|
||||
// perform->set_active (true);
|
||||
|
||||
pack_start (*luma);
|
||||
pack_start (*Ldetail);
|
||||
pack_start (*chroma);
|
||||
pack_start (*redchro);
|
||||
pack_start (*bluechro);
|
||||
|
||||
pack_start (*gamma);
|
||||
// pack_start (*perform);
|
||||
|
||||
}
|
||||
|
||||
@@ -70,19 +104,39 @@ void DirPyrDenoise::read (const ProcParams* pp, const ParamsEdited* pedited) {
|
||||
luma->setEditedState (pedited->dirpyrDenoise.luma ? Edited : UnEdited);
|
||||
Ldetail->setEditedState (pedited->dirpyrDenoise.Ldetail ? Edited : UnEdited);
|
||||
chroma->setEditedState (pedited->dirpyrDenoise.chroma ? Edited : UnEdited);
|
||||
redchro->setEditedState (pedited->dirpyrDenoise.redchro ? Edited : UnEdited);
|
||||
bluechro->setEditedState (pedited->dirpyrDenoise.bluechro ? Edited : UnEdited);
|
||||
|
||||
gamma->setEditedState (pedited->dirpyrDenoise.gamma ? Edited : UnEdited);
|
||||
enabled->set_inconsistent (!pedited->dirpyrDenoise.enabled);
|
||||
// perform->set_inconsistent (!pedited->dirpyrDenoise.perform);
|
||||
|
||||
}
|
||||
|
||||
// perfconn.block (true);
|
||||
enaConn.block (true);
|
||||
enabled->set_active (pp->dirpyrDenoise.enabled);
|
||||
enaConn.block (false);
|
||||
|
||||
lastEnabled = pp->dirpyrDenoise.enabled;
|
||||
// perform->set_active (pp->dirpyrDenoise.perform);
|
||||
|
||||
enaConn.block (false);
|
||||
// perfconn.block (false);
|
||||
lastEnabled = pp->dirpyrDenoise.enabled;
|
||||
// lastperform = pp->dirpyrDenoise.perform;
|
||||
luma->setValue (pp->dirpyrDenoise.luma);
|
||||
Ldetail->setValue (pp->dirpyrDenoise.Ldetail);
|
||||
chroma->setValue (pp->dirpyrDenoise.chroma);
|
||||
redchro->setValue (pp->dirpyrDenoise.redchro);
|
||||
bluechro->setValue (pp->dirpyrDenoise.bluechro);
|
||||
dmethodconn.block(true);
|
||||
if (pedited && !pedited->dirpyrDenoise.dmethod)
|
||||
dmethod->set_active (2);
|
||||
else if (pp->dirpyrDenoise.dmethod=="RGB")
|
||||
dmethod->set_active (0);
|
||||
else if (pp->dirpyrDenoise.dmethod=="Lab")
|
||||
dmethod->set_active (1);
|
||||
dmethodconn.block(false);
|
||||
// Have to be manually called to handle initial state update
|
||||
dmethodChanged();
|
||||
|
||||
gamma->setValue (pp->dirpyrDenoise.gamma);
|
||||
|
||||
enableListener ();
|
||||
@@ -93,35 +147,61 @@ void DirPyrDenoise::write (ProcParams* pp, ParamsEdited* pedited) {
|
||||
pp->dirpyrDenoise.luma = luma->getValue ();
|
||||
pp->dirpyrDenoise.Ldetail = Ldetail->getValue ();
|
||||
pp->dirpyrDenoise.chroma = chroma->getValue ();
|
||||
pp->dirpyrDenoise.redchro = redchro->getValue ();
|
||||
pp->dirpyrDenoise.bluechro = bluechro->getValue ();
|
||||
pp->dirpyrDenoise.gamma = gamma->getValue ();
|
||||
pp->dirpyrDenoise.enabled = enabled->get_active();
|
||||
// pp->dirpyrDenoise.perform = perform->get_active();
|
||||
|
||||
if (pedited) {
|
||||
pedited->dirpyrDenoise.luma = luma->getEditedState ();
|
||||
pedited->dirpyrDenoise.Ldetail = Ldetail->getEditedState ();
|
||||
pedited->dirpyrDenoise.chroma = chroma->getEditedState ();
|
||||
pedited->dirpyrDenoise.redchro = redchro->getEditedState ();
|
||||
pedited->dirpyrDenoise.bluechro = bluechro->getEditedState ();
|
||||
pedited->dirpyrDenoise.gamma = gamma->getEditedState ();
|
||||
pedited->dirpyrDenoise.enabled = !enabled->get_inconsistent();
|
||||
}
|
||||
// pedited->dirpyrDenoise.perform = !perform->get_inconsistent();
|
||||
}
|
||||
if (dmethod->get_active_row_number()==0)
|
||||
pp->dirpyrDenoise.dmethod = "RGB";
|
||||
else if (dmethod->get_active_row_number()==1)
|
||||
pp->dirpyrDenoise.dmethod = "Lab";
|
||||
|
||||
|
||||
}
|
||||
void DirPyrDenoise::dmethodChanged () {
|
||||
|
||||
if (listener && (multiImage||enabled->get_active()) ) {
|
||||
listener->panelChanged (EvDPDNmet, dmethod->get_active_text ());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void DirPyrDenoise::setDefaults (const ProcParams* defParams, const ParamsEdited* pedited) {
|
||||
|
||||
luma->setDefault (defParams->dirpyrDenoise.luma);
|
||||
Ldetail->setDefault (defParams->dirpyrDenoise.Ldetail);
|
||||
chroma->setDefault (defParams->dirpyrDenoise.chroma);
|
||||
redchro->setDefault (defParams->dirpyrDenoise.redchro);
|
||||
bluechro->setDefault (defParams->dirpyrDenoise.bluechro);
|
||||
gamma->setDefault (defParams->dirpyrDenoise.gamma);
|
||||
|
||||
if (pedited) {
|
||||
luma->setDefaultEditedState (pedited->dirpyrDenoise.luma ? Edited : UnEdited);
|
||||
Ldetail->setDefaultEditedState (pedited->dirpyrDenoise.Ldetail ? Edited : UnEdited);
|
||||
chroma->setDefaultEditedState (pedited->dirpyrDenoise.chroma ? Edited : UnEdited);
|
||||
redchro->setDefaultEditedState (pedited->dirpyrDenoise.redchro ? Edited : UnEdited);
|
||||
bluechro->setDefaultEditedState (pedited->dirpyrDenoise.bluechro ? Edited : UnEdited);
|
||||
gamma->setDefaultEditedState (pedited->dirpyrDenoise.gamma ? Edited : UnEdited);
|
||||
}
|
||||
else {
|
||||
luma->setDefaultEditedState (Irrelevant);
|
||||
Ldetail->setDefaultEditedState (Irrelevant);
|
||||
chroma->setDefaultEditedState (Irrelevant);
|
||||
redchro->setDefaultEditedState (Irrelevant);
|
||||
bluechro->setDefaultEditedState (Irrelevant);
|
||||
gamma->setDefaultEditedState (Irrelevant);
|
||||
}
|
||||
}
|
||||
@@ -138,6 +218,10 @@ void DirPyrDenoise::adjusterChanged (Adjuster* a, double newval) {
|
||||
listener->panelChanged (EvDPDNLuma, costr);
|
||||
else if (a==chroma)
|
||||
listener->panelChanged (EvDPDNChroma, costr);
|
||||
else if (a==redchro)
|
||||
listener->panelChanged (EvDPDNredchro, costr);
|
||||
else if (a==bluechro)
|
||||
listener->panelChanged (EvDPDNbluechro, costr);
|
||||
else if (a==gamma)
|
||||
listener->panelChanged (EvDPDNGamma, costr);
|
||||
}
|
||||
@@ -165,6 +249,30 @@ void DirPyrDenoise::enabledChanged () {
|
||||
listener->panelChanged (EvDPDNEnabled, M("GENERAL_DISABLED"));
|
||||
}
|
||||
}
|
||||
/*
|
||||
void DirPyrDenoise::perform_toggled () {
|
||||
|
||||
if (batchMode) {
|
||||
if (perform->get_inconsistent()) {
|
||||
perform->set_inconsistent (false);
|
||||
perfconn.block (true);
|
||||
perform->set_active (false);
|
||||
perfconn.block (false);
|
||||
}
|
||||
else if (lastperform)
|
||||
perform->set_inconsistent (true);
|
||||
|
||||
lastperform = perform->get_active ();
|
||||
}
|
||||
|
||||
if (listener) {
|
||||
if (perform->get_active ())
|
||||
listener->panelChanged (EvDPDNperform, M("GENERAL_ENABLED"));
|
||||
else
|
||||
listener->panelChanged (EvDPDNperform, M("GENERAL_DISABLED"));
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
void DirPyrDenoise::setBatchMode (bool batchMode) {
|
||||
|
||||
@@ -172,14 +280,20 @@ void DirPyrDenoise::setBatchMode (bool batchMode) {
|
||||
luma->showEditedCB ();
|
||||
Ldetail->showEditedCB ();
|
||||
chroma->showEditedCB ();
|
||||
redchro->showEditedCB ();
|
||||
bluechro->showEditedCB ();
|
||||
gamma->showEditedCB ();
|
||||
dmethod->append_text (M("GENERAL_UNCHANGED"));
|
||||
|
||||
}
|
||||
|
||||
void DirPyrDenoise::setAdjusterBehavior (bool chrolumaadd, bool gammaadd) {
|
||||
void DirPyrDenoise::setAdjusterBehavior (bool lumaadd, bool lumdetadd, bool chromaadd, bool chromaredadd, bool chromablueadd, bool gammaadd) {
|
||||
|
||||
luma->setAddMode(chrolumaadd);
|
||||
Ldetail->setAddMode(chrolumaadd);
|
||||
chroma->setAddMode(chrolumaadd);
|
||||
luma->setAddMode(lumaadd);
|
||||
Ldetail->setAddMode(lumdetadd);
|
||||
chroma->setAddMode(chromaadd);
|
||||
redchro->setAddMode(chromaredadd);
|
||||
bluechro->setAddMode(chromablueadd);
|
||||
gamma->setAddMode(gammaadd);
|
||||
}
|
||||
|
||||
@@ -188,5 +302,7 @@ void DirPyrDenoise::trimValues (rtengine::procparams::ProcParams* pp) {
|
||||
luma->trimValue(pp->dirpyrDenoise.luma);
|
||||
Ldetail->trimValue(pp->dirpyrDenoise.Ldetail);
|
||||
chroma->trimValue(pp->dirpyrDenoise.chroma);
|
||||
redchro->trimValue(pp->dirpyrDenoise.redchro);
|
||||
bluechro->trimValue(pp->dirpyrDenoise.bluechro);
|
||||
gamma->trimValue(pp->dirpyrDenoise.gamma);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user