exposure before interpolation from branch default
This commit is contained in:
@@ -41,6 +41,20 @@ PreProcess::PreProcess ()
|
||||
caBlue = Gtk::manage(new Adjuster (M("PREFERENCES_CABLUE"),-4.0,4.0,0.1,0));
|
||||
caBlue->setAdjusterListener (this);
|
||||
caBlue->show();
|
||||
//exposi
|
||||
/*exPos = Gtk::manage(new Adjuster (M("PREFERENCES_EXPOS"),0.2,4.0,0.1,1));
|
||||
exPos->setAdjusterListener (this);
|
||||
exPos->show();
|
||||
exPreser = Gtk::manage(new Adjuster (M("PREFERENCES_PRESER"),0,2.5,0.1,0));
|
||||
exPreser->setAdjusterListener (this);
|
||||
exPreser->show();*/
|
||||
PexPos = Gtk::manage(new Adjuster (M("PREFERENCES_EXPOS"),0.2,4.0,0.1,1));
|
||||
PexPos->setAdjusterListener (this);
|
||||
PexPos->show();
|
||||
PexPreser = Gtk::manage(new Adjuster (M("PREFERENCES_PRESER"),0,2.5,0.1,0));
|
||||
PexPreser->setAdjusterListener (this);
|
||||
PexPreser->show();
|
||||
|
||||
|
||||
hotDeadPixel = Gtk::manage(new Gtk::CheckButton((M("PREFERENCES_HOTDEADPIXFILT"))));
|
||||
|
||||
@@ -60,6 +74,9 @@ PreProcess::PreProcess ()
|
||||
pack_start( *caAutocorrect, Gtk::PACK_SHRINK, 4);
|
||||
pack_start( *caRed, Gtk::PACK_SHRINK, 4);
|
||||
pack_start( *caBlue, Gtk::PACK_SHRINK, 4);
|
||||
pack_start( *PexPos, Gtk::PACK_SHRINK, 4);//exposi
|
||||
pack_start( *PexPreser, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
pack_start( *Gtk::manage (new Gtk::HSeparator()));
|
||||
pack_start( *lineDenoise, Gtk::PACK_SHRINK, 4);
|
||||
pack_start( *Gtk::manage (new Gtk::HSeparator()));
|
||||
@@ -85,6 +102,10 @@ void PreProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEd
|
||||
caAutocorrect->set_inconsistent(!pedited->raw.caCorrection);
|
||||
caRed->setEditedState( pedited->raw.caRed ? Edited : UnEdited );
|
||||
caBlue->setEditedState( pedited->raw.caBlue ? Edited : UnEdited );
|
||||
PexPos->setEditedState( pedited->raw.exPos ? Edited : UnEdited );
|
||||
PexPreser->setEditedState( pedited->raw.exPreser ? Edited : UnEdited );
|
||||
|
||||
//exposure
|
||||
hotDeadPixel->set_inconsistent (!pedited->raw.hotDeadPixel);
|
||||
lineDenoise->setEditedState( pedited->raw.linenoise ? Edited : UnEdited );
|
||||
greenEqThreshold->setEditedState( pedited->raw.greenEq ? Edited : UnEdited );
|
||||
@@ -103,6 +124,9 @@ void PreProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEd
|
||||
caAutocorrect->set_active(pp->raw.ca_autocorrect);
|
||||
caRed->setValue (pp->raw.cared);
|
||||
caBlue->setValue (pp->raw.cablue);
|
||||
PexPos->setValue (pp->raw.expos);
|
||||
PexPreser->setValue (pp->raw.preser);//exposi
|
||||
|
||||
hotDeadPixel->set_active (pp->raw.hotdeadpix_filt);
|
||||
lineDenoise->setValue (pp->raw.linenoise);
|
||||
greenEqThreshold->setValue (pp->raw.greenthresh);
|
||||
@@ -124,6 +148,9 @@ void PreProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedi
|
||||
pp->raw.ca_autocorrect = caAutocorrect->get_active();
|
||||
pp->raw.cared = (double)caRed->getValue();
|
||||
pp->raw.cablue = (double)caBlue->getValue();
|
||||
pp->raw.expos = (double)PexPos->getValue();
|
||||
pp->raw.preser = (double)PexPreser->getValue();//exposi
|
||||
|
||||
pp->raw.hotdeadpix_filt = hotDeadPixel->get_active();
|
||||
pp->raw.linenoise = (int)lineDenoise->getValue();
|
||||
pp->raw.greenthresh = (int)greenEqThreshold->getValue();
|
||||
@@ -136,6 +163,9 @@ void PreProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedi
|
||||
pedited->raw.caCorrection = !caAutocorrect->get_inconsistent();
|
||||
pedited->raw.caRed = caRed->getEditedState ();
|
||||
pedited->raw.caBlue = caBlue->getEditedState ();
|
||||
pedited->raw.exPos = PexPos->getEditedState ();
|
||||
pedited->raw.exPreser = PexPreser->getEditedState ();//exposi
|
||||
|
||||
pedited->raw.hotDeadPixel = !hotDeadPixel->get_inconsistent();
|
||||
}
|
||||
}
|
||||
@@ -151,6 +181,9 @@ void PreProcess::setBatchMode(bool batchMode)
|
||||
ToolPanel::setBatchMode (batchMode);
|
||||
caRed->showEditedCB ();
|
||||
caBlue->showEditedCB ();
|
||||
PexPos->showEditedCB ();
|
||||
PexPreser->showEditedCB ();//exposi
|
||||
|
||||
lineDenoise->showEditedCB ();
|
||||
greenEqThreshold->showEditedCB ();
|
||||
}
|
||||
@@ -160,16 +193,25 @@ void PreProcess::setDefaults(const rtengine::procparams::ProcParams* defParams,
|
||||
lineDenoise->setDefault( defParams->raw.linenoise);
|
||||
caRed->setDefault( defParams->raw.cared);
|
||||
caBlue->setDefault( defParams->raw.cablue);
|
||||
PexPos->setDefault( defParams->raw.expos);
|
||||
PexPreser->setDefault( defParams->raw.preser);
|
||||
|
||||
greenEqThreshold->setDefault (defParams->raw.greenthresh);
|
||||
if (pedited) {
|
||||
lineDenoise->setDefaultEditedState( pedited->raw.linenoise ? Edited : UnEdited);
|
||||
caRed->setDefaultEditedState( pedited->raw.caRed ? Edited : UnEdited);
|
||||
caBlue->setDefaultEditedState( pedited->raw.caBlue ? Edited : UnEdited);
|
||||
PexPos->setDefaultEditedState( pedited->raw.exPos ? Edited : UnEdited);
|
||||
PexPreser->setDefaultEditedState( pedited->raw.exPreser ? Edited : UnEdited);
|
||||
|
||||
greenEqThreshold->setDefaultEditedState(pedited->raw.greenEq ? Edited : UnEdited);
|
||||
}else{
|
||||
lineDenoise->setDefaultEditedState( Irrelevant );
|
||||
caRed->setDefaultEditedState( Irrelevant );
|
||||
caBlue->setDefaultEditedState( Irrelevant );
|
||||
PexPos->setDefaultEditedState( Irrelevant );
|
||||
PexPreser->setDefaultEditedState( Irrelevant );
|
||||
|
||||
greenEqThreshold->setDefaultEditedState(Irrelevant );
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user