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

Removed "post mosaic artifact/noise reduction" since it harmed image quality

Browse Source 
see issue 848
This commit is contained in:
Oliver Duis
2012-06-13 07:31:17 +02:00
parent 2f87079816
commit f40bc8e39a
7 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/demosaic_algos.cc
View File

@@ -1080,6 +1080,7 @@ void RawImageSource::nodemosaic()
// increases the signal to noise ratio (PSNR) # +1 to +2 dB : tested with Dcraw : eg: Lighthouse + AMaZE : whitout refinement:39.96dB, with refinement:41.86 dB
// reduce color artifacts, improves the interpolation
// but it's relatively slow
/* DISABLED: it actually decreases image quality by increases some image noise and generates blocky edges
void RawImageSource::refinement_lassus()
{
const int PassCount=2; // two passes EECI refine, slow but best results...
@@ -1213,6 +1214,7 @@ void RawImageSource::refinement_lassus()
t2e.set();
if (settings->verbose) printf("Refinement %d usec\n", t2e.etime(t1e));
}
*/
/*
* Redistribution and use in source and binary forms, with or without

2
rtengine/rawimagesource.cc
View File

@@ -1144,7 +1144,7 @@ void RawImageSource::demosaic(const RAWParams &raw)
if( settings->verbose )
printf("Demosaicing: %s - %d usec\n",raw.dmethod.c_str(), t2.etime(t1));
if (raw.all_enhance) refinement_lassus();
//if (raw.all_enhance) refinement_lassus();
rgbSourceModified = false;
}

2
rtengine/rawimagesource.h
View File

@@ -140,7 +140,7 @@ class RawImageSource : public ImageSource {
void flushRawData ();
void flushRGB ();
void HLRecovery_Global (HRecParams hrp);
void refinement_lassus ();
//void refinement_lassus ();
bool IsrgbSourceModified() {return rgbSourceModified;} // tracks whether cached rgb output of demosaic has been modified

14
rtgui/partialpastedlg.cc
View File

@@ -100,7 +100,7 @@ PartialPasteDlg::PartialPasteDlg (Glib::ustring title) {
raw_ccSteps = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAW_FALSECOLOR")));
raw_dcb_iterations = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAW_DCBITERATIONS")));
raw_dcb_enhance = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAW_DCBENHANCE")));
raw_all_enhance = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAW_ALLENHANCE")));
//raw_all_enhance = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAW_ALLENHANCE")));
df_file = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_DARKFRAMEFILE")));
df_AutoSelect = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_DARKFRAMEAUTOSELECT")));
@@ -174,7 +174,7 @@ PartialPasteDlg::PartialPasteDlg (Glib::ustring title) {
vboxes[6]->pack_start (*raw_ccSteps, Gtk::PACK_SHRINK, 2);
vboxes[6]->pack_start (*raw_dcb_iterations, Gtk::PACK_SHRINK, 2);
vboxes[6]->pack_start (*raw_dcb_enhance, Gtk::PACK_SHRINK, 2);
vboxes[6]->pack_start (*raw_all_enhance, Gtk::PACK_SHRINK, 2);
//vboxes[6]->pack_start (*raw_all_enhance, Gtk::PACK_SHRINK, 2);
vboxes[6]->pack_start (*Gtk::manage (new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 0);
vboxes[6]->pack_start (*raw_linenoise, Gtk::PACK_SHRINK, 2);
vboxes[6]->pack_start (*raw_greenthresh, Gtk::PACK_SHRINK, 2);
@@ -280,7 +280,7 @@ PartialPasteDlg::PartialPasteDlg (Glib::ustring title) {
raw_ccStepsConn = raw_ccSteps->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true));
raw_dcb_iterationsConn = raw_dcb_iterations->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true));
raw_dcb_enhanceConn = raw_dcb_enhance->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true));
raw_all_enhanceConn = raw_all_enhance->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true));
//raw_all_enhanceConn = raw_all_enhance->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true));
raw_exposConn = raw_expos->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true));
raw_preserConn = raw_preser->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true));
@@ -350,7 +350,7 @@ void PartialPasteDlg::rawToggled () {
raw_ccStepsConn.block (true);
raw_dcb_iterationsConn.block (true);
raw_dcb_enhanceConn.block (true);
raw_all_enhanceConn.block (true);
//raw_all_enhanceConn.block (true);
raw_exposConn.block (true);
raw_preserConn.block (true);
raw_blackConn.block (true);
@@ -373,7 +373,7 @@ void PartialPasteDlg::rawToggled () {
raw_ccSteps->set_active (raw->get_active ());
raw_dcb_iterations->set_active (raw->get_active ());
raw_dcb_enhance->set_active (raw->get_active ());
raw_all_enhance->set_active (raw->get_active ());
//raw_all_enhance->set_active (raw->get_active ());
raw_expos->set_active (raw->get_active ());
raw_preser->set_active (raw->get_active ());
raw_black->set_active (raw->get_active ());
@@ -394,7 +394,7 @@ void PartialPasteDlg::rawToggled () {
raw_ccStepsConn.block (false);
raw_dcb_iterationsConn.block (false);
raw_dcb_enhanceConn.block (false);
raw_all_enhanceConn.block (false);
//raw_all_enhanceConn.block (false);
raw_exposConn.block (false);
raw_preserConn.block (false);
raw_blackConn.block (false);
@@ -623,7 +623,7 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
if (!raw_ccSteps->get_active ()) filterPE.raw.ccSteps = falsePE.raw.ccSteps;
if (!raw_dcb_iterations->get_active ()) filterPE.raw.dcbIterations = falsePE.raw.dcbIterations;
if (!raw_dcb_enhance->get_active ()) filterPE.raw.dcbEnhance = falsePE.raw.dcbEnhance;
if (!raw_all_enhance->get_active ()) filterPE.raw.allEnhance = falsePE.raw.allEnhance;
//if (!raw_all_enhance->get_active ()) filterPE.raw.allEnhance = falsePE.raw.allEnhance;
if (!raw_expos->get_active ()) filterPE.raw.exPos = falsePE.raw.exPos;
if (!raw_preser->get_active ()) filterPE.raw.exPreser = falsePE.raw.exPreser;

4
rtgui/partialpastedlg.h
View File

@@ -96,7 +96,7 @@ class PartialPasteDlg : public Gtk::Dialog {
Gtk::CheckButton* raw_ccSteps;
Gtk::CheckButton* raw_dcb_iterations;
Gtk::CheckButton* raw_dcb_enhance;
Gtk::CheckButton* raw_all_enhance;
//Gtk::CheckButton* raw_all_enhance;
Gtk::CheckButton* df_file;
Gtk::CheckButton* df_AutoSelect;
@@ -114,7 +114,7 @@ class PartialPasteDlg : public Gtk::Dialog {
sigc::connection coarserotConn, finerotConn, cropConn, resizeConn, perspectiveConn, commonTransConn;
sigc::connection exifchConn, iptcConn, icmConn, gamcsconn;
sigc::connection df_fileConn, df_AutoSelectConn, ff_fileConn, ff_AutoSelectConn, ff_BlurRadiusConn, ff_BlurTypeConn;
sigc::connection raw_caredConn, raw_cablueConn, raw_ca_autocorrectConn, raw_hotdeadpix_filtConn, raw_linenoiseConn, raw_greenthreshConn, raw_ccStepsConn, raw_dmethodConn, raw_dcb_iterationsConn, raw_all_enhanceConn, raw_dcb_enhanceConn, raw_exposConn, raw_preserConn, raw_blackConn;
sigc::connection raw_caredConn, raw_cablueConn, raw_ca_autocorrectConn, raw_hotdeadpix_filtConn, raw_linenoiseConn, raw_greenthreshConn, raw_ccStepsConn, raw_dmethodConn, raw_dcb_iterationsConn, raw_dcb_enhanceConn, raw_exposConn, raw_preserConn, raw_blackConn; //,raw_all_enhanceConn
public:
PartialPasteDlg (Glib::ustring title);

28
rtgui/rawprocess.cc
View File

@@ -57,15 +57,15 @@ RawProcess::RawProcess () : Gtk::VBox(), FoldableToolPanel(this)
pack_start( *Gtk::manage( new Gtk::HSeparator()), Gtk::PACK_SHRINK, 0 );
allOptions = Gtk::manage (new Gtk::VBox ());
//allOptions = Gtk::manage (new Gtk::VBox ());
//allOptions->set_border_width(2);
allEnhance = Gtk::manage (new Gtk::CheckButton(M("TP_RAW_ALLENHANCE")));
allOptions->pack_start(*allEnhance);
pack_start( *allOptions, Gtk::PACK_SHRINK, 4);
//allEnhance = Gtk::manage (new Gtk::CheckButton(M("TP_RAW_ALLENHANCE")));
//allOptions->pack_start(*allEnhance);
//pack_start( *allOptions, Gtk::PACK_SHRINK, 4);
methodconn = dmethod->signal_changed().connect( sigc::mem_fun(*this, &RawProcess::methodChanged) );
dcbEnhconn = dcbEnhance->signal_toggled().connect ( sigc::mem_fun(*this, &RawProcess::dcbEnhanceChanged), true);
allEnhconn = allEnhance->signal_toggled().connect ( sigc::mem_fun(*this, &RawProcess::allEnhanceChanged), true);
//allEnhconn = allEnhance->signal_toggled().connect ( sigc::mem_fun(*this, &RawProcess::allEnhanceChanged), true);
}
@@ -74,7 +74,7 @@ void RawProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEd
disableListener ();
methodconn.block (true);
dcbEnhconn.block (true);
allEnhconn.block (true);
//allEnhconn.block (true);
dmethod->set_active(procparams::RAWParams::numMethods);
for( size_t i=0; i< procparams::RAWParams::numMethods;i++)
@@ -82,7 +82,7 @@ void RawProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEd
dmethod->set_active(i);
break;
}
allEnhance->set_active(pp->raw.all_enhance);
//allEnhance->set_active(pp->raw.all_enhance);
dcbIterations->setValue (pp->raw.dcb_iterations);
dcbEnhance->set_active(pp->raw.dcb_enhance);
@@ -100,13 +100,13 @@ void RawProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEd
ccOptions->hide();
lastDCBen = pp->raw.dcb_enhance;
lastALLen = pp->raw.all_enhance;
//lastALLen = pp->raw.all_enhance;
if(pedited ){
ccSteps->setEditedState (pedited->raw.ccSteps ? Edited : UnEdited);
dcbIterations->setEditedState ( pedited->raw.dcbIterations ? Edited : UnEdited);
dcbEnhance->set_inconsistent(!pedited->raw.dcbEnhance);
allEnhance->set_inconsistent(!pedited->raw.allEnhance);
//allEnhance->set_inconsistent(!pedited->raw.allEnhance);
if( !pedited->raw.dmethod )
dmethod->set_active(procparams::RAWParams::numMethods); // No name
@@ -114,7 +114,7 @@ void RawProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEd
methodconn.block (false);
dcbEnhconn.block (false);
allEnhconn.block (false);
//allEnhconn.block (false);
enableListener ();
}
@@ -124,7 +124,7 @@ void RawProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedi
pp->raw.ccSteps = ccSteps->getIntValue();
pp->raw.dcb_iterations = dcbIterations->getIntValue();
pp->raw.dcb_enhance = dcbEnhance->get_active();
pp->raw.all_enhance = allEnhance->get_active();
//pp->raw.all_enhance = allEnhance->get_active();
int currentRow = dmethod->get_active_row_number();
if( currentRow>=0 && currentRow < procparams::RAWParams::numMethods)
@@ -135,7 +135,7 @@ void RawProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedi
pedited->raw.dmethod = dmethod->get_active_row_number() != procparams::RAWParams::numMethods;
pedited->raw.dcbIterations = dcbIterations->getEditedState ();
pedited->raw.dcbEnhance = !dcbEnhance->get_inconsistent();
pedited->raw.allEnhance = !allEnhance->get_inconsistent();
//pedited->raw.allEnhance = !allEnhance->get_inconsistent();
}
}
@@ -206,7 +206,7 @@ void RawProcess::dcbEnhanceChanged ()
listener->panelChanged (EvDemosaicDCBEnhanced, dcbEnhance->get_active()?M("GENERAL_ENABLED"):M("GENERAL_DISABLED"));
}
void RawProcess::allEnhanceChanged ()
/*void RawProcess::allEnhanceChanged ()
{
if (batchMode) {
if (allEnhance->get_inconsistent()) {
@@ -222,4 +222,4 @@ void RawProcess::allEnhanceChanged ()
}
if (listener)
listener->panelChanged (EvDemosaicALLEnhanced, allEnhance->get_active()?M("GENERAL_ENABLED"):M("GENERAL_DISABLED"));
}
}*/

10
rtgui/rawprocess.h
View File

@@ -36,12 +36,12 @@ class RawProcess : public Gtk::VBox, public AdjusterListener, public FoldableToo
Gtk::VBox *ccOptions;
Adjuster* dcbIterations;
Gtk::CheckButton* dcbEnhance;
Gtk::VBox *allOptions;
Gtk::CheckButton* allEnhance;
//Gtk::VBox *allOptions;
//Gtk::CheckButton* allEnhance;
bool lastDCBen;
bool lastALLen;
sigc::connection methodconn,dcbEnhconn,allEnhconn;
//bool lastALLen;
sigc::connection methodconn,dcbEnhconn; //,allEnhconn;
public:
RawProcess ();
@@ -54,7 +54,7 @@ class RawProcess : public Gtk::VBox, public AdjusterListener, public FoldableToo
void methodChanged ();
void adjusterChanged (Adjuster* a, double newval);
void dcbEnhanceChanged();
void allEnhanceChanged();
//void allEnhanceChanged();
};